| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #290 from git-marijus/master | friendica | 2014-01-29 | 3 | -11/+44 |
| |\ | |||||
| | * | 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 branch 'master' of https://github.com/friendica/red | marijus | 2014-01-27 | 4 | -10/+12 |
| | |\ \ | |||||
| | * | | | Revert "disable feature setting for collections and make feature settings for... | marijus | 2014-01-26 | 2 | -10/+7 |
| | * | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-01-26 | 5 | -5/+27 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-01-26 | 3 | -111/+53 |
| | |\ \ \ \ | |||||
| | * | | | | | disable feature setting for collections and make feature settings for persona... | marijus | 2014-01-25 | 2 | -7/+10 |
| * | | | | | | Merge pull request #289 from beardy-unixer/master | friendica | 2014-01-29 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | 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 pull request #291 from toclimb/smilies-fix | friendica | 2014-01-29 | 1 | -13/+12 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Don't look for emoticons inside the matching angle brackets of HTML tags (ser... | toclimb | 2014-01-29 | 1 | -13/+12 |
| |/ / / / / / | |||||
| * / / / / / | Doco - add KDE/Gnome/Davfs2 instructions | Thomas Willingham | 2014-01-29 | 2 | -2/+77 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #288 from tuscanhobbit/master | Paolo T | 2014-01-29 | 2 | -1353/+1355 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | 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 | 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 addre... | friendica | 2014-01-28 | 5 | -5/+12 |
| |/ / / / / / / | |||||
| * | | | | | | | preserve expiration when editing | friendica | 2014-01-27 | 3 | -4/+11 |
| * | | | | | | | chat data structures | friendica | 2014-01-27 | 3 | -11/+110 |
| * | | | | | | | Ajaxchat package has way too many incompatible assumptions - after a lot of r... | friendica | 2014-01-27 | 197 | -24152/+0 |
| * | | | | | | | photo tagging still broken - but at least don't create a new linked item ever... | friendica | 2014-01-27 | 3 | -1/+7 |
| * | | | | | | | In order to provide ajax chat accessible by remote visitors (xchans), we need... | friendica | 2014-01-27 | 1 | -5/+5 |
| * | | | | | | | after rposting - if there's no remote_return, go to your matrix page rather t... | friendica | 2014-01-27 | 1 | -2/+4 |
| * | | | | | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-27 | 2 | -4/+27 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of https://github.com/MicMee/red | Michael Meer | 2014-01-27 | 66 | -1685/+1831 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-24 | 52 | -972/+605 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | build url, deleted logger commands | Michael Meer | 2014-01-23 | 1 | -4/+3 |
| | * | | | | | | | | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-23 | 3 | -2/+3 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | preperation for ping, need training in SQL :( | Michael Meer | 2014-01-23 | 1 | -1/+6 |
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |