Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | dont show an empty link to profile creation if multi_profile is not enabled | marijus | 2014-01-30 | 1 | -2/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-01-30 | 1 | -3/+4 |
|\ | |||||
| * | typo and clear chattext after submission | friendica | 2014-01-30 | 1 | -3/+4 |
| | | |||||
* | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-01-30 | 4 | -13/+29 |
|\| | |||||
| * | a bit more ajax work on chat and chatsvc and some fiddling with layouts | friendica | 2014-01-30 | 4 | -13/+29 |
| | | |||||
* | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-01-30 | 11 | -11/+392 |
|\| | |||||
| * | chatroom management front-end stuff | friendica | 2014-01-29 | 5 | -1/+119 |
| | | |||||
| * | back-end for changing online status and keeping presence refreshed | friendica | 2014-01-29 | 3 | -1/+26 |
| | | |||||
| * | start on the ajax bits | friendica | 2014-01-29 | 3 | -5/+35 |
| | | |||||
| * | apply service class limits (at the account level) to chatroom creation as ↵ | friendica | 2014-01-29 | 1 | -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. | friendica | 2014-01-29 | 1 | -3/+9 |
| | | |||||
| * | mod/chatsvc - ajax backend for chat | friendica | 2014-01-29 | 1 | -0/+104 |
| | | |||||
| * | more chat infrastructure | friendica | 2014-01-29 | 3 | -6/+89 |
| | | |||||
| * | more testing of chatroom interfaces, also corrected a function call that ↵ | friendica | 2014-01-29 | 4 | -4/+7 |
| | | | | | | | | should have been a class instantiation in reddav | ||||
* | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-01-30 | 1 | -2/+2 |
|\| | |||||
| * | Merge pull request #290 from git-marijus/master | friendica | 2014-01-29 | 3 | -11/+44 |
| |\ | | | | | | | add image floating to bbcode | ||||
| * \ | Merge pull request #289 from beardy-unixer/master | friendica | 2014-01-29 | 1 | -2/+2 |
| |\ \ | | | | | | | | | Make Firefox behave if an attachment points to a file with a space in it... | ||||
| | * | | Really fix attachments in Firefox | Thomas Willingham | 2014-01-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | Doco - add KDE/Gnome/Davfs2 instructions | Thomas Willingham | 2014-01-29 | 2 | -2/+77 |
| | | | | |||||
| | * | | Make Firefox behave if an attachment points to a file with a space in it. | Thomas Willingham | 2014-01-29 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-01-30 | 3 | -15/+89 |
|\| | | | |_|/ |/| | | |||||
| * | | Merge pull request #291 from toclimb/smilies-fix | friendica | 2014-01-29 | 1 | -13/+12 |
| |\ \ | | | | | | | | | Trying to make emoticons behave, 2nd round | ||||
| | * | | Don't look for emoticons inside the matching angle brackets of HTML tags ↵ | toclimb | 2014-01-29 | 1 | -13/+12 |
| |/ / | | | | | | | | | | (seriously) | ||||
| * / | Doco - add KDE/Gnome/Davfs2 instructions | Thomas Willingham | 2014-01-29 | 2 | -2/+77 |
| |/ | |||||
* | | minor whitespace cleanup | marijus | 2014-01-30 | 1 | -1/+0 |
| | | |||||
* | | oups | marijus | 2014-01-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'upstream' | marijus | 2014-01-30 | 232 | -25593/+1859 |
|\ \ | |||||
| * | | add image floating to bbcode | marijus | 2014-01-30 | 3 | -12/+46 |
| |/ | |||||
| * | Merge pull request #288 from tuscanhobbit/master | Paolo T | 2014-01-29 | 2 | -1353/+1355 |
| |\ | | | | | | | Updated Italian translation | ||||
| | * | Updated Italian translation | Paolo Tacconi | 2014-01-29 | 0 | -0/+0 |
| | |\ | |||||
| | * | | Updated Italian translation | Paolo Tacconi | 2014-01-29 | 2 | -3760/+3881 |
| | | | | |||||
| * | | | chatroom permissions enforcement | friendica | 2014-01-29 | 1 | -0/+19 |
| | | | | |||||
| * | | | debug chatroom_list widget | friendica | 2014-01-29 | 2 | -4/+5 |
| | | | | |||||
| * | | | prevent runaway presence indication | friendica | 2014-01-29 | 1 | -2/+2 |
| | | | | |||||
| * | | | issues uncovered whilst testing the chatroom API | friendica | 2014-01-29 | 2 | -11/+17 |
| | | | | |||||
| * | | | add template for chatroomlist widget | friendica | 2014-01-29 | 1 | -0/+11 |
| | | | | |||||
| * | | | chatroom list widget backend | friendica | 2014-01-29 | 2 | -0/+18 |
| | | | | |||||
| * | | | basic chatroom management backend | friendica | 2014-01-29 | 3 | -2/+119 |
| | | | | |||||
| * | | | chatpresence timing out too quickly | friendica | 2014-01-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | missing file in checkin | friendica | 2014-01-28 | 1 | -0/+11 |
| | | | | |||||
| * | | | online indication to the directory popup | friendica | 2014-01-28 | 3 | -1/+27 |
| | | | | |||||
| * | | | online indication on profile sidebar | friendica | 2014-01-28 | 4 | -2/+33 |
| | | | | |||||
| * | | | SECURITY: remove style and class bbcodes | friendica | 2014-01-28 | 1 | -8/+0 |
| | | | | |||||
| * | | | undo pull request #287 | friendica | 2014-01-28 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #287 from toclimb/testing | friendica | 2014-01-28 | 1 | -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 tag | toclimb | 2014-01-29 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | fix sql query and provide setting to hide online status | friendica | 2014-01-28 | 3 | -1/+11 |
| | | | | | |||||
| * | | | | basic presence indication | friendica | 2014-01-28 | 1 | -0/+25 |
| | | | | | |||||
| * | | | | add client field to chatpresence - which will give us a place to put IP ↵ | friendica | 2014-01-28 | 5 | -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 editing | friendica | 2014-01-27 | 3 | -4/+11 |
| | | | |