aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pull'friendica2011-12-274-11/+54
|\
| * translation of email templatesTobias Diekershoff2011-12-262-0/+42
| * translation of email templateTobias Diekershoff2011-12-261-5/+6
| * translation of the email templateTobias Diekershoff2011-12-261-6/+6
* | notification testingfriendica2011-12-273-10/+10
* | notify_introfriendica2011-12-263-19/+40
* | extending notifications to other typesfriendica2011-12-265-144/+52
|/
* new notification module working for "email message received"friendica2011-12-253-128/+66
* Merge branch 'master' into notifyfriendica2011-12-252-2/+2
|\
| * Merge branch 'pull'friendica2011-12-251-1/+1
| |\
| | * Merge pull request #20 from Keith2/masterfriendica2011-12-251-1/+1
| | |\
| | | * modified: settings.php corrected TLS email connector not working due to sp...root2011-12-251-1/+1
| | |/
| * | revupfriendica2011-12-251-1/+1
| * | revupfriendica2011-12-241-1/+1
* | | more enotifyfriendica2011-12-252-14/+16
* | | more enotifyfriendica2011-12-243-10/+46
* | | more work on enotifyfriendica2011-12-232-8/+91
* | | Merge branch 'master' into notifyfriendica2011-12-231-1/+1
|\| |
| * | revupfriendica2011-12-231-1/+1
* | | Merge branch 'master' into notifyfriendica2011-12-230-0/+0
|\| |
| * | preparation for 3g email contactsfriendica2011-12-231-1/+7
| |/
* | preparation for 3rd generation email contactsfriendica2011-12-231-1/+7
* | Merge branch 'master' into notifyfriendica2011-12-221-5/+3
|\|
| * improved cid searchfriendica2011-12-221-5/+3
* | 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