aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-01-062-2/+36
|\
| * network select widgetfriendica2012-01-051-0/+33
| * comment previewfriendica2012-01-051-2/+3
* | Use html5 placeholder for title text inputFabio Comuni2012-01-061-1/+2
* | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-01-065-42/+126
|\|
| * send diaspora share notification back to originator for auto friendingfriendica2012-01-051-21/+4
| * dynamic title input box - via fabrixxmfriendica2012-01-041-1/+4
| * support auto-friend page types for Diasporafriendica2012-01-041-3/+50
| * Allow Diaspora to post to forumsfriendica2012-01-041-1/+6
| * new smileyfriendica2012-01-041-1/+3
| * add verb and item to notifications to aid in localisationfriendica2012-01-032-3/+15
| * suggestion notificationsfriendica2012-01-033-15/+46
| * fix reference variable effects on sortingfriendica2012-01-032-4/+8
* | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-01-035-10/+97
|\|
| * check count before foreachfriendica2012-01-021-2/+3
| * sql optimisation cont.friendica2012-01-021-1/+1
| * conversation sql optimisationsfriendica2012-01-021-0/+59
| * text: "turn off" logger() if module is "install"Fabio Comuni2012-01-021-0/+4
| * dba: leave unconnected if $server and $user are not definedFabio Comuni2012-01-021-7/+14
| * datetime: new field_timezone() function, new template field_select_raw.tplFabio Comuni2012-01-021-2/+18
* | Merge branch 'master' of github.com:fabrixxm/friendicaFabio Comuni2012-01-022-5/+17
|\ \ | |/ |/|
| * Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-12-221-4/+10
| |\
| * | quattro: more on editorFabio Comuni2011-12-221-0/+7
| * | Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-12-211-2/+2
| |\ \
| * \ \ Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-12-204-2/+18
| |\ \ \
| * | | | quattro: more on editorFabio Comuni2011-12-201-1/+2
| * | | | Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-12-193-28/+49
| |\ \ \ \
| * | | | | config: set/get arrays with pconfigFabio Comuni2011-12-191-4/+8
* | | | | | change default ostatus poll intervalfriendica2012-01-011-1/+1
* | | | | | function not definedfriendica2011-12-301-0/+4
* | | | | | migrate more notificationsfriendica2011-12-292-121/+31
* | | | | | add notifications to d* private messagesfriendica2011-12-271-0/+13
* | | | | | notification testingfriendica2011-12-271-8/+8
* | | | | | notify_introfriendica2011-12-261-2/+25
* | | | | | extending notifications to other typesfriendica2011-12-261-23/+23
* | | | | | new notification module working for "email message received"friendica2011-12-252-128/+65
* | | | | | more enotifyfriendica2011-12-251-10/+12
* | | | | | more enotifyfriendica2011-12-241-10/+9
* | | | | | more work on enotifyfriendica2011-12-232-8/+91
* | | | | | preparation for 3rd generation email contactsfriendica2011-12-231-1/+7
* | | | | | Merge branch 'master' into notifyfriendica2011-12-226-35/+78
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | bug #188 diaspora_signed_retraction not removing postfriendica2011-12-211-4/+10
| | |_|_|/ | |/| | |
| * | | | audio/video bb tags showing up on Diasporafriendica2011-12-201-2/+2
| | |_|/ | |/| |
| * | | bug 244 multiple birthday reminders from Diaspora if profile changed repeatedlyfriendica2011-12-192-1/+7
| * | | more data checking, cleans up some infrequent php errorsfriendica2011-12-192-0/+10
| * | | invalid thread-id in "nouveau" mode of conversation, bug 245friendica2011-12-191-1/+1
| | |/ | |/|
| * | poco_load aborting after debug statementfriendica2011-12-191-2/+15
| * | suggest query for no friends messed upfriendica2011-12-181-5/+7
| * | add webfinger addr to gcontact for friend "connect" linksfriendica2011-12-181-7/+15
| * | improve the email regex a bit morefriendica2011-12-161-1/+1