| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-30 | 6 | -20/+39 | |
| |\ | ||||||
| | * | Merge pull request #293 from MicMee/master | friendica | 2014-01-30 | 5 | -18/+38 | |
| | |\ | | | | | | | more progress in admin to maintain hubloc with ping | |||||
| | | * | started analysis of ping response and clean up more logger | Michael Meer | 2014-01-30 | 2 | -7/+16 | |
| | | | | ||||||
| | | * | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-30 | 1 | -3/+4 | |
| | | |\ | | | | | | | | | | | | | . | |||||
| | | * | | clean up logger commands. Placed apostrophs at the end from some comments to ↵ | Michael Meer | 2014-01-30 | 4 | -15/+3 | |
| | | | | | | | | | | | | | | | | | keep the syntax highlighting in vi working | |||||
| | | * | | attempt with fix URL for testing works | Michael Meer | 2014-01-30 | 5 | -7/+19 | |
| | | | | | ||||||
| | | * | | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-30 | 21 | -1394/+1900 | |
| | | |\ \ | | | | | | | | | | | | | | | | to be in sync with master repro | |||||
| | | * | | | ping gives us now a reply. But the reply doesnt contains useful data, ↵ | Michael Meer | 2014-01-29 | 1 | -11/+13 | |
| | | | | | | | | | | | | | | | | | | | | | requires still some investigations | |||||
| | | * | | | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-29 | 21 | -17/+293 | |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | to be in sync with main repro | |||||
| | | * | | | | to make visible what I try, ping still won't work, but I'm confused about ↵ | Michael Meer | 2014-01-28 | 2 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | get_channel | |||||
| | | * | | | | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-28 | 209 | -24210/+141 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | to be in sync with main repro | |||||
| | | * | | | | | add a temporary logger command at remote server side | Michael Meer | 2014-01-27 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge pull request #292 from git-marijus/master | friendica | 2014-01-30 | 1 | -2/+1 | |
| | |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | dont show an empty link to profile creation if multi_profile is not enabled | |||||
| | | * | | | | | 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 | |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | | * | | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-01-30 | 4 | -13/+29 | |
| | | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | ||||||
| | | * | | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-01-30 | 11 | -11/+392 | |
| | | |\ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-01-30 | 1 | -2/+2 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-01-30 | 3 | -15/+89 | |
| | | |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | fix basic auth with account (not channel) login | friendica | 2014-01-30 | 1 | -1/+1 | |
| |/ / / / / / / / / | ||||||
| * | | | | / / / / | typo and clear chattext after submission | friendica | 2014-01-30 | 1 | -3/+4 | |
| | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | | a bit more ajax work on chat and chatsvc and some fiddling with layouts | friendica | 2014-01-30 | 4 | -13/+29 | |
| | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | | 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 pull request #290 from git-marijus/master | friendica | 2014-01-29 | 3 | -11/+44 | |
| |\| | | | | | | | | | | | | | | | | | add image floating to bbcode | |||||
| | * | | | | | 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 ↵ | marijus | 2014-01-26 | 2 | -10/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for personal and new tab working." This reverts commit ed00301bb641d716e43876572be640f8252b9b05. | |||||
| | * | | | | | | | 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 ↵ | marijus | 2014-01-25 | 2 | -7/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | personal and new tab working. | |||||
| * | | | | | | | | | | 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 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 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | 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 | |
| | | | | | | | | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |