aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ping gives us now a reply. But the reply doesnt contains useful data, require...Michael Meer2014-01-291-11/+13
* Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-2921-17/+293
|\
| * chatroom permissions enforcementfriendica2014-01-291-0/+19
| * debug chatroom_list widgetfriendica2014-01-292-4/+5
| * prevent runaway presence indicationfriendica2014-01-291-2/+2
| * issues uncovered whilst testing the chatroom APIfriendica2014-01-292-11/+17
| * add template for chatroomlist widgetfriendica2014-01-291-0/+11
| * chatroom list widget backendfriendica2014-01-292-0/+18
| * basic chatroom management backendfriendica2014-01-293-2/+119
| * chatpresence timing out too quicklyfriendica2014-01-281-1/+1
| * missing file in checkinfriendica2014-01-281-0/+11
| * online indication to the directory popupfriendica2014-01-283-1/+27
| * online indication on profile sidebarfriendica2014-01-284-2/+33
| * SECURITY: remove style and class bbcodesfriendica2014-01-281-8/+0
| * undo pull request #287friendica2014-01-281-2/+2
| * Merge pull request #287 from toclimb/testingfriendica2014-01-281-0/+2
| |\
| | * Don't look for text emoticons inside the matching angle brackets of a HTML tagtoclimb2014-01-291-0/+2
| * | fix sql query and provide setting to hide online statusfriendica2014-01-283-1/+11
| * | basic presence indicationfriendica2014-01-281-0/+25
| * | add client field to chatpresence - which will give us a place to put IP addre...friendica2014-01-285-5/+12
| |/
* | to make visible what I try, ping still won't work, but I'm confused about get...Michael Meer2014-01-282-1/+9
* | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-28209-24210/+141
|\|
| * preserve expiration when editingfriendica2014-01-273-4/+11
| * chat data structuresfriendica2014-01-273-11/+110
| * Ajaxchat package has way too many incompatible assumptions - after a lot of r...friendica2014-01-27197-24152/+0
| * photo tagging still broken - but at least don't create a new linked item ever...friendica2014-01-273-1/+7
| * In order to provide ajax chat accessible by remote visitors (xchans), we need...friendica2014-01-271-5/+5
| * after rposting - if there's no remote_return, go to your matrix page rather t...friendica2014-01-271-2/+4
| * Merge https://github.com/friendica/red into zpullfriendica2014-01-272-4/+27
| |\
| * | cleanup include/menu in preparation for the next phase of bookmarkingfriendica2014-01-273-42/+11
* | | add a temporary logger command at remote server sideMichael Meer2014-01-271-0/+1
| |/ |/|
* | Merge branch 'master' of https://github.com/MicMee/redMichael Meer2014-01-2766-1685/+1831
|\|
| * add davguest param to cut/paste link for directories in mod/filestoragefriendica2014-01-262-4/+2
| * The final piece of the DAV authentication puzzle. Provide a directory view to...friendica2014-01-262-6/+10
| * allow site defaults for enabled featuresfriendica2014-01-262-1/+3
| * don't prompt guests for a password if they're accessing an embedded public file.friendica2014-01-263-4/+24
| * Merge https://github.com/friendica/red into zpullfriendica2014-01-251-2/+3
| |\
| | * Typoroot2014-01-251-2/+3
| * | some tweaks to items_fetch for the apifriendica2014-01-252-19/+21
| |/
| * Merge pull request #284 from cvogeley/masterfriendica2014-01-252-24/+47
| |\
| | * Check user_info['self] in api user_timelineChristian Vogeley2014-01-251-4/+13
| | * remove wall restrictionChristian Vogeley2014-01-251-2/+1
| | * API My wall postsChristian Vogeley2014-01-252-21/+33
| | * Add $since_id to items_fetchChristian Vogeley2014-01-221-2/+5
| * | set session['my_address'] to current site in change channel, not primary hub ...friendica2014-01-251-85/+1
| * | Merge https://github.com/friendica/red into zpullfriendica2014-01-256-1307/+1332
| |\ \
| | * \ Merge pull request #285 from tobiasd/de20140125tobiasd2014-01-242-1302/+1309
| | |\ \
| | | * | DE: update to the stringsTobias Diekershoff2014-01-252-1302/+1309
| | |/ /
| | * | Merge pull request #283 from beardy-unixer/masterfriendica2014-01-244-5/+23
| | |\ \
| | | * | Left over line from placeholder.Thomas Willingham2014-01-251-1/+0