Commit graph

3528 commits

Author SHA1 Message Date
friendica
3bf192ba08 Merge branch 'pull' 2011-11-29 01:19:43 -08:00
friendica
aa73d38845 begininning d* conversation mode 2011-11-29 01:19:09 -08:00
friendica
669f40c342 private notes in testbubble 2011-11-29 01:18:18 -08:00
fabrixxm
f6ff4e582f Merge pull request #10 from fabrixxm/master
small quattro things
2011-11-29 00:32:12 -08:00
Fabio Comuni
68dee0fa71 quattro: "manage" menu item in site menu 2011-11-29 09:30:21 +01:00
Fabio Comuni
938b2bf438 quattro: default user image in item 2011-11-29 09:29:56 +01:00
friendica
3afa248238 use default post permissions when coming from api - unless permissions are explicitly set. 2011-11-28 20:09:10 -08:00
friendica
034038849c mysql error report fix (no mysqli), suggested friends for new members settings 2011-11-28 19:28:33 -08:00
friendica
f4e1135f79 poco addition to provide a "suggestme" for new members 2011-11-28 15:11:59 -08:00
friendica
ccef899577 start of d* private mail, dba without mysqli 2011-11-27 17:41:23 -08:00
friendica
d9e1ebfc48 wrong length in image extractor 2011-11-27 14:03:49 -08:00
friendica
1055ef3eea more readable private image extraction for bypassing preg limits 2011-11-27 13:44:45 -08:00
friendica
cf7568efd7 extract private images before bbcode translation since preg has issues with large data sizes. 2011-11-27 04:09:14 -08:00
friendica
0f4a42f550 start on bug #227 - more to do 2011-11-25 22:41:50 -08:00
friendica
6b93324c11 "show more" -> move closer to text 2011-11-24 18:51:14 -08:00
friendica
a1c277ed1a remove old liveupdate marker 2011-11-24 18:46:07 -08:00
friendica
4b95e8ebe8 rework the liveupdate fixes - what a mess 2011-11-24 18:26:06 -08:00
friendica
757ca5014c move liveupdate after birthdays/events 2011-11-24 17:32:45 -08:00
friendica
cd81dcfc9d nasty stuff... 2011-11-24 17:00:20 -08:00
friendica
dcb209152d more thread update fixes 2011-11-24 16:54:10 -08:00
friendica
9e8053e3bd fixing conversation updates 2011-11-24 16:42:12 -08:00
friendica
8aae7f047d comments collapsing on page update 2011-11-24 13:54:21 -08:00
friendica
b795ce4fe7 little stuff - name change, live updates, new network types 2011-11-23 23:17:26 -08:00
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