aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into notifyfriendica2011-12-2234-2483/+2848
|\
| * revupfriendica2011-12-221-1/+1
| * better handling of the display of conflicting group permissionsfriendica2011-12-211-2/+8
| * bug #188 diaspora_signed_retraction not removing postfriendica2011-12-212-5/+11
| * bug #247friendica2011-12-211-1/+2
| * implement max daily registrationsfriendica2011-12-201-0/+19
| * bug #246friendica2011-12-201-6/+9
| * audio/video bb tags showing up on Diasporafriendica2011-12-204-5/+8
| * remove hashchars from pub keywordsfriendica2011-12-201-1/+1
| * wrong style for unvisited linksfriendica2011-12-191-1/+1
| * bug 244 multiple birthday reminders from Diaspora if profile changed repeatedlyfriendica2011-12-193-1/+16
| * more data checking, cleans up some infrequent php errorsfriendica2011-12-192-0/+10
| * invalid thread-id in "nouveau" mode of conversation, bug 245friendica2011-12-192-2/+2
| * jquery effects missing from zero derivativesfriendica2011-12-193-0/+135
| * poco_load aborting after debug statementfriendica2011-12-191-2/+15
| * suggest query for no friends messed upfriendica2011-12-181-5/+7
| * connect on suggest/match - added to testbubblefriendica2011-12-183-1/+13
| * make mod-follow "get"-ablefriendica2011-12-182-4/+6
| * add connect link to suggestion and matchesfriendica2011-12-185-2/+20
| * add connect link to friend suggestfriendica2011-12-183-3/+10
| * add webfinger addr to gcontact for friend "connect" linksfriendica2011-12-184-9/+22
| * fix xml poco for arraysfriendica2011-12-181-6/+2
| * typofriendica2011-12-181-0/+1
| * typofriendica2011-12-181-1/+1
| * add webfinger to poco, if presentfriendica2011-12-183-3/+9
| * improve the email regex a bit morefriendica2011-12-161-1/+1
| * bug 241 - valid emails may contain + on lhsfriendica2011-12-162-2/+2
| * eliminate dup identical hashtags in postsfriendica2011-12-161-3/+7
| * default suggestions not being collected properlyfriendica2011-12-151-1/+2
| * revupfriendica2011-12-151-1/+1
| * must use named vars in plugin argsfriendica2011-12-151-1/+2
| * home_init hookfriendica2011-12-152-13/+12
| * simplify live updatefriendica2011-12-141-2/+9
| * testingfriendica2011-12-141-2/+2
| * live update glitches cont.friendica2011-12-141-4/+2
| * Merge branch 'pull'friendica2011-12-141-2354/+2343
| |\
| | * Merge pull request #19 from fabrixxm/masterfabrixxm2011-12-141-2354/+2343
| | |\
| | | * Update messages.poFabio Comuni2011-12-141-2354/+2343
| | |/
| * / name change stragglers, fix newmember links, liveupdate glitchfriendica2011-12-144-13/+15
| |/
| * "new" view broken after liveupdate fixesfriendica2011-12-141-3/+2
| * string updatefriendica2011-12-131-606/+702
| * update link locationsfriendica2011-12-131-2/+2
| * liveupdate: only modify existing conversations if not page1friendica2011-12-132-2/+3
* | Merge branch 'master' into notifyfriendica2011-12-1221-290/+401
|\|
| * unnecessary slash in profile update pathfriendica2011-12-121-1/+1
| * clearup update backlog after commentingfriendica2011-12-121-0/+6
| * default ajax settings after conversionfriendica2011-12-121-1/+1
| * change default ajax interval to 40 secondsfriendica2011-12-122-5/+5
| * remove all plugins from default configfriendica2011-12-128-50/+1
| * live update improvementsfriendica2011-12-122-31/+44