aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
| | | | | | |
| | * | | | | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-233-2/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | to be in sync with main repro
| | * | | | | | preperation for ping, need training in SQL :(Michael Meer2014-01-231-1/+6
| | | | | | | |
| | * | | | | | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-236-24/+58
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | to be in sync with main repro
| | * \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-222-9/+5
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to keep the repros in sync
| | * | | | | | | | reorg formula data for hubloc checksMichael Meer2014-01-222-5/+15
| | | | | | | | | |
| | * | | | | | | | start with hubloc pingMichael Meer2014-01-221-0/+9
| | | | | | | | | |
| * | | | | | | | | cleanup include/menu in preparation for the next phase of bookmarkingfriendica2014-01-273-42/+11
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-274-10/+12
|\| | | | | | | |
| * | | | | | | | 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 ↵friendica2014-01-262-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to an un-auth'd person (without asking for a password) by adding a query parameter 'davguest=1'. This is a bit of a hack, but there was no response on the official forum about how to do this correctly so it will have to do. On the downside, if permission is denied, it won't ask for a password - but we're talking about unauthenticated folks who didn't go through magic auth so chances are even if they authenticate, permission will still be denied.
* | | | | | | | | 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
|\| | | | | | | |
| * | | | | | | | 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 branch 'master' of https://github.com/friendica/redmarijus2014-01-263-111/+53
|\| | | | | | | |
| * | | | | | | | Merge https://github.com/friendica/red into zpullfriendica2014-01-251-2/+3
| |\ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-17 02:55:31 +0000