Commit Graph

3305 Commits

Author SHA1 Message Date
friendica fe0c039d48 Merge branch 'pull' 2011-11-23 14:05:00 -08:00
friendica 7a259d4acb ensure comment counts update after refactor of collapsed comments 2011-11-23 14:03:53 -08:00
friendica a628587e90 Merge pull request #9 from felixgilles/patch-1
Duplicate KEY 'wall' in TABLE 'item'
2011-11-23 13:34:32 -08:00
felixgilles 16a81c5b01 Duplicate KEY 'wall' in TABLE 'item' 2011-11-23 22:13:38 +01:00
friendica 335c0cddcf diaspora reshared lists rendering as html 2011-11-23 01:44:07 -08:00
friendica deb182b92e string update es,fr 2011-11-22 16:13:23 -08:00
friendica 1443a0c8cd Merge branch 'pull' 2011-11-22 16:02:12 -08:00
friendica 53590d2166 rework show/hide comments 2011-11-22 16:00:05 -08:00
Tobias Diekershoff 4f555212a1 German strings 2011-11-22 16:48:53 +01:00
friendica c568493f57 add expire_starred option, fix "delete selected" on some themes, new project name in email templates 2011-11-21 19:01:05 -08:00
fabrixxm ea04263f52 Merge pull request #8 from fabrixxm/master
expire settings, clean html from php, more work on quattro
2011-11-21 04:57:56 -08:00
Fabio Comuni cb05e677a9 Merge remote-tracking branch 'friendica/master' 2011-11-21 13:52:15 +01:00
Fabio Comuni a86fd26bd8 more work on quattro. remove html from php for groups and saved searches widgets. 2011-11-21 12:34:22 +01:00
friendica aaedac8f57 community forums cleanup 2011-11-19 13:45:20 -08:00
friendica 44dcef2948 revup 2011-11-19 13:37:10 -08:00
friendica 191a9b048f forum cleanup 2011-11-19 03:13:46 -08:00
friendica 4f4a873da8 Merge branch 'master' into groups 2011-11-19 03:08:16 -08:00
friendica 72dd6457b0 first forum test 2011-11-19 03:06:15 -08:00
friendica d4911f15e9 don't allow space in autocomplete nickname 2011-11-18 23:02:07 -08:00
friendica 6463543832 new approach to secondary delivery fork 2011-11-18 22:20:08 -08:00
friendica fd4fe24406 Merge branch 'master' into groups 2011-11-18 22:04:41 -08:00
friendica 6893df991e update user-agent string for remote http requests 2011-11-18 22:03:49 -08:00
friendica 0d77ca1caa Merge branch 'pull' 2011-11-18 21:56:17 -08:00
friendica d53db63d41 forum split delivery flag 2011-11-18 21:55:00 -08:00
friendica fa4742e6ee comment boxes not work in alternate languages 2011-11-17 15:42:56 -08:00
Fabio Comuni 590f1d2b25 log less in expire items 2011-11-17 16:18:59 +01:00
Fabio Comuni 79603e3146 expire settings for items, notes and photos.
show default privacy acl in popup
2011-11-17 15:53:59 +01:00
fabrixxm 32f17e7e24 Merge pull request #7 from fabrixxm/master
Fix possibile fatal error with oembed
2011-11-17 04:53:22 -08:00
Fabio Comuni 844a36e2b6 Merge remote-tracking branch 'friendica/master' 2011-11-17 13:40:27 +01:00
Fabio Comuni 02281be0c3 oembed: don't try to fetch media files and add Accept request header to fetch_url 2011-11-17 13:40:11 +01:00
friendica c9846b745d allow dup tag names with different urls 2011-11-16 17:09:58 -08:00
friendica ede25aabce check all attribute names for validity 2011-11-16 14:23:06 -08:00
friendica fb8dbfa1bb Merge branch 'pull' 2011-11-16 04:16:21 -08:00
friendica b4218614ed change hide profile setting text 2011-11-16 04:15:14 -08:00
fabrixxm d0bf9d371c Merge pull request #6 from fabrixxm/master
small fix
2011-11-16 02:30:38 -08:00
Fabio Comuni d77c87f42a Merge branch 'master' of github.com:fabrixxm/friendica 2011-11-16 11:28:31 +01:00
Fabio Comuni ef8b5bc682 fix localize item tag 2011-11-16 11:27:20 +01:00
friendica 306a69b5f4 update 2011-11-15 23:14:25 -08:00
friendica 7b58de743a add a few more sql indexes 2011-11-15 23:12:56 -08:00
friendica 485f97b3d8 tgroup relays 2011-11-15 20:30:34 -08:00
friendica 3bd2b731b2 Merge https://github.com/friendica/friendica into pull 2011-11-15 12:09:22 -08:00
friendica 6726d406f0 revup - change connector config link in doc 2011-11-15 12:01:21 -08:00
fabrixxm 5a890b0ef9 Merge pull request #5 from fabrixxm/master
themes and strings works
2011-11-15 10:43:57 -08:00
Fabio Comuni 281f9edce7 Update IT strings 2011-11-15 19:40:38 +01:00
Fabio Comuni dc3d47edcf update messages.po 2011-11-15 17:42:45 +01:00
Fabio Comuni f5bfe5a1a3 quattro: tags style 2011-11-15 17:42:30 +01:00
Fabio Comuni 9b2cbc33ae ping: show tags 2011-11-15 17:41:51 +01:00
Fabio Comuni 962467ee68 item tags as array to templates 2011-11-15 17:41:38 +01:00
Fabio Comuni 5c7fb2b0fe quattro: fix delete selected items 2011-11-15 16:17:36 +01:00
Fabio Comuni ae43a96d70 Merge remote-tracking branch 'friendica/master' 2011-11-15 16:00:40 +01:00