aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | 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
| |/ / /
| * | | preserve expiration when editingfriendica2014-01-273-4/+11
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-07 13:42:45 +0000