Commit graph

Select branches

Hide pull requests

master

#1

#12

#12

#18

#19

#2

#20

#21

#22

#23

#26

#27

#28

#30

#31

#32

#33

#34

#35

#36

#37

#38

#41

#42

#46

#51

#52

#53

#54

#56

#57

#59

#61

2.2

2.21

2.3

2.32

2.33

2.34

2.35

2.36

2.37

2.38

2.39

2.3beta1

2.3beta2

3.0

3.01

3.1

3.2

3.3

3.3-RC

3.3.1

3.3.2

psr4-example

Mono Color

• 6100ae98a2 Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2013-02-24 18:19:55 +01:00
• cf677a3003 Merge pull request #628 from fermionic/20130223-limit-body-size-on-email-imports fermionic 2013-02-24 07:13:21 -08:00
• c35feb27f2 community: Only show top postings, no comments parse_url: Follow location in "meta"-header Michael Vogel 2013-02-24 12:54:53 +01:00
• ab81be3bb1 Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2013-02-24 12:31:25 +01:00
• 521ccc38c6 Merge pull request #625 from tobiasd/master tobiasd 2013-02-23 23:27:21 -08:00
• 69776fc54e Merge pull request #627 from fermionic/20130223-quattro-vier-smarty-updates tobiasd 2013-02-23 23:26:48 -08:00
• c83b82ee2b Merge pull request #626 from fermionic/20130223-disable-content-in-notifications tobiasd 2013-02-23 23:25:49 -08:00
• c0d1caa47d Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2013-02-23 19:57:31 +01:00
• 023752ae46 DE: update to the strings Tobias Diekershoff 2013-02-23 19:56:21 +01:00
• fcab22b80f run limit_body_size on imported emails, which don't go through consume_feed Zach Prezkuta 2013-02-23 10:06:59 -07:00
• 047cf0d342 some smarty templates needed updating Zach Prezkuta 2013-02-23 09:36:00 -07:00
• 3843f821b2 better description Zach Prezkuta 2013-02-23 09:33:29 -07:00
• 4db50a3ecb admin option to disable post content in email notifications for the site Zach Prezkuta 2013-02-23 09:31:34 -07:00
• c2b49f2588 make sure conv_as->items is an array or don't proceed Tobias Diekershoff 2013-02-23 12:42:55 +01:00
• c35b21eb18 Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2013-02-23 08:25:12 +01:00
• 6e21534f23 Merge https://github.com/friendica/friendica into pull friendica 2013-02-22 17:12:14 -08:00
• c8717ede42 rev update friendica 2013-02-22 17:12:03 -08:00
• 45de0fa21b Merge pull request #624 from fabrixxm/quattrofixs fabrixxm 2013-02-22 08:29:29 -08:00
• 331fcdb94b Merge pull request #623 from fabrixxm/master fabrixxm 2013-02-22 08:26:52 -08:00
• 7ac30330c6 update IT strings.php Fabrixxm 2013-02-22 11:21:34 -05:00
• 7a6d63a1b3 quattro: autocomplete private message To field Fabrixxm 2013-02-22 11:02:01 -05:00
• cc210bae3d quattro: fix item max-width, fix contact serarch autocomplete popup style Fabrixxm 2013-02-22 10:45:40 -05:00
• 6db780dd33 Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2013-02-22 16:05:11 +01:00
• ad16311be6 Merge pull request #622 from zzottel/master zzottel 2013-02-22 04:27:49 -08:00
• a17dd541ee reorder the update of the item table as instructed by Michael Vogel zottel 2013-02-22 13:26:11 +01:00
• 280b72b9e6 Merge https://github.com/friendica/friendica into pull friendica 2013-02-21 16:43:01 -08:00
• 615b060352 rev update friendica 2013-02-21 16:42:34 -08:00
• 41f31f3282 Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2013-02-21 22:47:06 +01:00
• dbf51229d9 Merge pull request #621 from annando/master fermionic 2013-02-21 10:16:50 -08:00
• 5c6562a996 modified: view/theme/smoothly/style.css pixelroot 2013-02-21 08:46:30 +01:00
• 0d4d15c73d Merge remote-tracking branch 'upstream/master' Michael Vogel 2013-02-20 21:57:26 +01:00
• c90272e2ae supressing warning when importing items. Speeding up community. Changed query for the search. Michael Vogel 2013-02-20 21:47:36 +01:00
• c2add79ac0 Merge remote branch 'upstream/master' pixelroot 2013-02-20 21:03:36 +01:00
• 7a1947b88a modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2013-02-20 21:03:02 +01:00
• 39d8fec290 no more googlegroups 23n 2013-02-20 21:01:19 +01:00
• 17ab34c7e7 Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2013-02-19 07:27:17 +01:00
• e0e82afe18 Merge pull request #620 from tobiasd/master tobiasd 2013-02-18 22:26:09 -08:00
• 4681d79491 Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2013-02-18 09:51:39 +01:00
• bd1c86ed49 PL: update to the strings Tobias Diekershoff 2013-02-18 09:18:45 +01:00
• c3c2f0a6bd Merge https://github.com/friendica/friendica into pull friendica 2013-02-17 17:23:35 -08:00
• d653bc4dbd rev update friendica 2013-02-17 17:23:19 -08:00
• 37389795b0 added robots.txt to the igmnored files Michael Vogel 2013-02-17 18:46:39 +01:00
• 7e154d5e4c plugin: orphaned hooks weren't deleted. update: fixing update job for tags. Michael Vogel 2013-02-17 18:05:30 +01:00
• 8e65e95d17 add multi vs. single user config to the admin panel Tobias Diekershoff 2013-02-17 17:42:32 +01:00
• aa2f1c38e9 add 'hide_help' to admin panel Tobias Diekershoff 2013-02-17 12:37:45 +01:00
• 1a1984c78d Updated from master Michael Vogel 2013-02-17 12:36:54 +01:00
• 93143702ed Merge remote-tracking branch 'upstream/master' Michael Vogel 2013-02-17 12:35:40 +01:00
• 2f22081a64 Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2013-02-17 11:20:11 +01:00
• 2e6577fb32 DE; update to the strings, fixing #476 Tobias Diekershoff 2013-02-17 11:19:12 +01:00
• fca8a23265 use enotify to send CC mails Tobias Diekershoff 2013-02-17 08:20:29 +01:00
• 3d86f47bbd Merge pull request #618 from tobiasd/master friendica 2013-02-16 15:56:31 -08:00
• 00cd04f193 Merge pull request #619 from fermionic/20130216-redir-with-contact-url friendica 2013-02-16 15:56:18 -08:00
• 8a8e02cb84 add support for doing a redir/ based on contact url Zach Prezkuta 2013-02-16 11:38:41 -07:00
• dfce513c4b Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2013-02-16 11:03:56 +01:00
• 77bc4cd0dc use entry title (if set) as subject when send by email Tobias Diekershoff 2013-02-16 11:03:46 +01:00
• 3d1dd3aac4 Merge pull request #617 from fabrixxm/master fabrixxm 2013-02-16 01:03:46 -08:00
• bc03bb5a4a Merge https://github.com/friendica/friendica into pull friendica 2013-02-15 17:41:42 -08:00
• bd8350562e 2012 is long gone friendica 2013-02-15 17:40:58 -08:00
• 3e58060b30 API: beautify the output of repeated items Vier: Birthday reminder looks better Michael Vogel 2013-02-15 20:14:45 +01:00
• 64ca15f7f9 update it strings Fabrixxm 2013-02-15 11:23:49 -05:00
• 9bf0f60290 Merge pull request #616 from fabrixxm/master fabrixxm 2013-02-15 03:39:00 -08:00
• 0a79b2300c delete item page respond with json if called via ajax. Fabrixxm 2013-02-15 06:34:32 -05:00
• f1a0aeb480 Merge remote branch 'friendica/master' Fabrixxm 2013-02-15 03:17:59 -05:00
• c5b8082c31 ZH-CN: update to the strings to 100% thx Matthew Tobias Diekershoff 2013-02-11 06:23:55 +01:00
• 3eeee2525c CA: update to the strings Tobias Diekershoff 2013-02-11 06:21:10 +01:00
• 8f2087a198 Merge pull request #611 from fermionic/20130209-cant-select-individual-contacts fermionic 2013-02-10 19:29:39 -08:00
• 8e80755a47 Merge pull request #615 from fermionic/20130210-update-frost-mobile fermionic 2013-02-10 16:12:50 -08:00
• e377fd9d22 add new Smarty3 templates Zach Prezkuta 2013-02-10 17:11:55 -07:00
• 6b6f00c702 Merge pull request #613 from fermionic/20130210-update-frost fermionic 2013-02-10 14:02:53 -08:00
• 1a91e6c196 Merge pull request #614 from fermionic/20130210-update-frost-mobile fermionic 2013-02-10 14:02:40 -08:00
• 646c161506 added files for Frost Mobile v0.3 Zach Prezkuta 2013-02-10 15:00:20 -07:00
• 4d8678e523 update to Frost v0.4 Zach Prezkuta 2013-02-10 14:57:44 -07:00
• 1bc48d43af Merge pull request #612 from fermionic/20130210-update-frost-mobile tobiasd 2013-02-10 11:04:03 -08:00
• c1c83115ad Update Frost-mobile to v0.3 Zach Prezkuta 2013-02-10 10:21:52 -07:00
• 399e8cd8e4 don't change to string in prune_deadguys() Zach Prezkuta 2013-02-09 17:52:29 -07:00
• 5195d99216 ZH-CN: update to the strings Tobias Diekershoff 2013-02-08 17:26:08 +01:00
• 7c1c2d8869 Merge pull request #610 from fermionic/20130208-duepuntozero-install-crash fermionic 2013-02-08 08:09:30 -08:00
• c4e6cb916d move all commands inside the duepuntozero_init() function Zach Prezkuta 2013-02-08 09:03:50 -07:00
• 6242f9a147 add .gif to fix_private_photos checking, try another tactic to reduce notification duplication - check for duplicates after storage rather than before. This tactic worked out well to reduce item duplication. friendica 2013-02-07 23:43:55 -08:00
• a0e18a0ff8 Merge pull request #601 from fermionic/20130204-100-percent-CPU-usage-on-xmlify fermionic 2013-02-06 21:38:15 -08:00
• c886927a52 use mb_ereg_replace for xmlify and unxmlify Zach Prezkuta 2013-02-06 22:30:27 -07:00
• 18f71c1050 parsing multi-byte strings with xmlify Zach Prezkuta 2013-02-06 00:37:15 -07:00
• 5e077e541a The community page is speeded up. Photos will be compressed before the output. Michael Vogel 2013-02-06 08:01:46 +01:00
• 774a78dbde better unicode support in xmlify Zach Prezkuta 2013-02-05 23:02:13 -07:00
• b00426c9fb Merge pull request #605 from fermionic/20130204-events-request-too-many-dates friendica 2013-02-05 17:36:58 -08:00
• c273adf0fe Merge pull request #608 from fermionic/20130204-diabook-reduce-css friendica 2013-02-05 17:36:33 -08:00
• 2e6446371a Merge pull request #602 from fermionic/20130204-permissions-bug-on-profile-page friendica 2013-02-05 17:36:06 -08:00
• 132600eee2 Merge pull request #603 from fermionic/20130204-info-message-shown-on-redir friendica 2013-02-05 17:35:39 -08:00
• b6008130c4 Merge pull request #600 from fermionic/20130204-message-button-on-own-profile friendica 2013-02-05 17:22:25 -08:00
• 34c9156fa1 Merge pull request #604 from fermionic/20130204-db-debugging-in-mod-display friendica 2013-02-05 17:22:05 -08:00
• 70f02053e1 Merge pull request #606 from fermionic/20130204-themes-cant-use-plugin-hooks friendica 2013-02-05 17:21:42 -08:00
• 2044862eb9 Merge pull request #607 from fermionic/20130204-attach-types-are-too-coarse friendica 2013-02-05 17:19:53 -08:00
• ff8c1be987 Merge pull request #609 from fermionic/20130204-move-tpl-scripts-to-util friendica 2013-02-05 17:19:23 -08:00
• 79e9214a75 Merge https://github.com/friendica/friendica into pull friendica 2013-02-05 15:10:23 -08:00
• 9bf8364506 rev update friendica 2013-02-05 15:09:28 -08:00
• 6690cd3fd8 Merge pull request #599 from fermionic/20130129-colorbox fermionic 2013-02-05 07:55:07 -08:00
• 53e5592f9a move tpl scripts to util Zach Prezkuta 2013-02-04 22:55:15 -07:00
• d8f7e9be26 make the diabook-aerith -wide.css variants inherit from the non-wide css files Zach Prezkuta 2013-02-04 22:34:48 -07:00
• 665af33726 have the base -wide.css variants inherit from the non-wide version Zach Prezkuta 2013-02-04 22:17:55 -07:00
• 6152cbd5ac add support for more file attachment types Zach Prezkuta 2013-02-04 22:15:16 -07:00