aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #293 from MicMee/masterfriendica2014-01-305-18/+38
|\
| * started analysis of ping response and clean up more loggerMichael Meer2014-01-302-7/+16
| * Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-301-3/+4
| |\
| * | clean up logger commands. Placed apostrophs at the end from some comments to ...Michael Meer2014-01-304-15/+3
| * | attempt with fix URL for testing worksMichael Meer2014-01-305-7/+19
| * | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-3021-1394/+1900
| |\ \
| * | | 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
| |\ \ \
| * | | | 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
| |\ \ \ \
| * | | | | add a temporary logger command at remote server sideMichael Meer2014-01-271-0/+1
* | | | | | Merge pull request #292 from git-marijus/masterfriendica2014-01-301-2/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | dont show an empty link to profile creation if multi_profile is not enabledmarijus2014-01-301-2/+1
| * | | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-301-3/+4
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | typo and clear chattext after submissionfriendica2014-01-301-3/+4
| |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-304-13/+29
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | a bit more ajax work on chat and chatsvc and some fiddling with layoutsfriendica2014-01-304-13/+29
| * | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-3011-11/+392
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | chatroom management front-end stufffriendica2014-01-295-1/+119
* | | | | back-end for changing online status and keeping presence refreshedfriendica2014-01-293-1/+26
* | | | | start on the ajax bitsfriendica2014-01-293-5/+35
* | | | | apply service class limits (at the account level) to chatroom creation as cha...friendica2014-01-291-0/+12
* | | | | chat is a members only feature, there is no "guest" access.friendica2014-01-291-3/+9
* | | | | mod/chatsvc - ajax backend for chatfriendica2014-01-291-0/+104
* | | | | more chat infrastructurefriendica2014-01-293-6/+89
* | | | | more testing of chatroom interfaces, also corrected a function call that shou...friendica2014-01-294-4/+7
| * | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-301-2/+2
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #290 from git-marijus/masterfriendica2014-01-293-11/+44
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #289 from beardy-unixer/masterfriendica2014-01-291-2/+2
|\ \ \ \ \ \
| * | | | | | Really fix attachments in FirefoxThomas Willingham2014-01-291-1/+1
| * | | | | | Doco - add KDE/Gnome/Davfs2 instructionsThomas Willingham2014-01-292-2/+77
| * | | | | | Make Firefox behave if an attachment points to a file with a space in it.Thomas Willingham2014-01-291-2/+2
| | | * | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-303-15/+89
| | |/| | | | | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #291 from toclimb/smilies-fixfriendica2014-01-291-13/+12
|\ \ \ \ \ \
| * | | | | | Don't look for emoticons inside the matching angle brackets of HTML tags (ser...toclimb2014-01-291-13/+12
|/ / / / / /
* / / / / / Doco - add KDE/Gnome/Davfs2 instructionsThomas Willingham2014-01-292-2/+77
|/ / / / /
| * | | | minor whitespace cleanupmarijus2014-01-301-1/+0
| * | | | oupsmarijus2014-01-301-1/+1
| * | | | Merge branch 'upstream'marijus2014-01-30232-25593/+1859
| |\ \ \ \
| | * | | | add image floating to bbcodemarijus2014-01-303-12/+46
| |/ / / / |/| | | |
* | | | | Merge pull request #288 from tuscanhobbit/masterPaolo T2014-01-292-1353/+1355
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Updated Italian translationPaolo Tacconi2014-01-290-0/+0
| |\ \ \ \
| * | | | | Updated Italian translationPaolo Tacconi2014-01-292-3760/+3881
* | | | | | 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