aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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)
* / / / / / Doco - add KDE/Gnome/Davfs2 instructionsThomas Willingham2014-01-292-2/+77
|/ / / / /
* | | | | Merge pull request #288 from tuscanhobbit/masterPaolo T2014-01-292-1353/+1355
|\ \ \ \ \ | | | | | | | | | | | | Updated Italian translation
| * \ \ \ \ 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 tag
| * | | | | | | 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 ↵friendica2014-01-285-5/+12
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | addresses for webRTC. Might as well allow for that since we'll (soon) have presence. Then we wouldn't need SIP and folks can "just" p2p each other using any mechanism they wish if they have permission to do so.
* | | | | | | 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 ↵friendica2014-01-27197-24152/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | review, we can't work with it without re-writing huge chunks. Think I'll just start fresh. Ajax chat isn't that hard and we can do stuff with it that you just can't do with other chat clients because - well we've got zot.
* | | | | | | photo tagging still broken - but at least don't create a new linked item ↵friendica2014-01-273-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | every time a photo is edited.
* | | | | | | In order to provide ajax chat accessible by remote visitors (xchans), we ↵friendica2014-01-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | need to remove any core assumptions that userID is an int (which is a common centralised site assumption). Additionally we won't be able to provide guest logins, as this also assumes integer ID's; so that ability needs to be disabled by configuration.
* | | | | | | after rposting - if there's no remote_return, go to your matrix page rather ↵friendica2014-01-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | than leave you on a blank rpost page.
* | | | | | | Merge https://github.com/friendica/red into zpullfriendica2014-01-272-4/+27
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/MicMee/redMichael Meer2014-01-2766-1685/+1831
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | to be in sync
| * | | | | | | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-2452-972/+605
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | to be in sync with master repro
| * | | | | | | | build url, deleted logger commandsMichael Meer2014-01-231-4/+3
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 07:10:23 +0000