aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* missing string delimiters (quotes)friendica2014-01-301-3/+3
|
* chat expiration (default 2 hours) - but can be set on a per-chatroom basisfriendica2014-01-304-5/+22
|
* mod/ping should only update basic_presence - and clearing stale entries. ↵friendica2014-01-301-9/+6
| | | | otherwise let rooms handle presence for themselves.
* more chat work - this time the ajax bits to actually show chats on the pagefriendica2014-01-301-5/+34
|
* Merge https://github.com/friendica/red into zpullfriendica2014-01-306-20/+39
|\
| * Merge pull request #293 from MicMee/masterfriendica2014-01-305-18/+38
| |\ | | | | | | more progress in admin to maintain hubloc with ping
| | * 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
| | | | | | | | | | | | | | | | keep the syntax highlighting in vi working
| | * | 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
| | |\ \ | | | | | | | | | | | | | | | to be in sync with master repro
| | * | | ping gives us now a reply. But the reply doesnt contains useful data, ↵Michael Meer2014-01-291-11/+13
| | | | | | | | | | | | | | | | | | | | requires still some investigations
| | * | | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-2921-17/+293
| | |\ \ \ | | | | | | | | | | | | | | | | | | to be in sync with main repro
| | * | | | to make visible what I try, ping still won't work, but I'm confused about ↵Michael Meer2014-01-282-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | get_channel
| | * | | | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-28209-24210/+141
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | to be in sync with main repro
| | * | | | | 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 enabled
| | * | | | | 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
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-304-13/+29
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-3011-11/+392
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-301-2/+2
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-303-15/+89
| | |\ \ \ \ \ \ \
* | | | | | | | | | fix basic auth with account (not channel) loginfriendica2014-01-301-1/+1
|/ / / / / / / / /
* | | | | / / / / typo and clear chattext after submissionfriendica2014-01-301-3/+4
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | a bit more ajax work on chat and chatsvc and some fiddling with layoutsfriendica2014-01-304-13/+29
| |_|_|/ / / / |/| | | | | |
* | | | | | | 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 ↵friendica2014-01-291-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | chat has the potential to adversely affect system performance. In the future we may also want to service_class restrict the number of participants in a room.
* | | | | | | 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 ↵friendica2014-01-294-4/+7
| |_|/ / / / |/| | | | | | | | | | | | | | | | | should have been a class instantiation in reddav
* | | | | | Merge pull request #290 from git-marijus/masterfriendica2014-01-293-11/+44
|\| | | | | | | | | | | | | | | | | add image floating to bbcode
| * | | | | 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 branch 'master' of https://github.com/friendica/redmarijus2014-01-274-10/+12
| |\ \ \ \ \ \
| * | | | | | | Revert "disable feature setting for collections and make feature settings ↵marijus2014-01-262-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for personal and new tab working." This reverts commit ed00301bb641d716e43876572be640f8252b9b05.
| * | | | | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-265-5/+27
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-263-111/+53
| |\ \ \ \ \ \ \ \
| * | | | | | | | | disable feature setting for collections and make feature settings for ↵marijus2014-01-252-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | personal and new tab working.
* | | | | | | | | | Merge pull request #289 from beardy-unixer/masterfriendica2014-01-291-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | Make Firefox behave if an attachment points to a file with a space in it...
| * | | | | | | | | 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 pull request #291 from toclimb/smilies-fixfriendica2014-01-291-13/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Trying to make emoticons behave, 2nd round
| * | | | | | | | | Don't look for emoticons inside the matching angle brackets of HTML tags ↵toclimb2014-01-291-13/+12
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | (seriously)