| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-02 | 3 | -10/+36 |
| |\ | |||||
| | * | Merge pull request #297 from tazmandevil/master | Thomas Willingham | 2014-02-02 | 1 | -1/+1 |
| | |\ | | | | | | | link hover colour remains user set link_colour (w/o change default,Mike) | ||||
| | | * | link hover colour remains user set link_colour (w/o change default, | Tazman DeVille | 2014-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | Mike) | ||||
| | * | | Move CSS out of chat template | Thomas Willingham | 2014-02-02 | 2 | -9/+35 |
| | |/ | |||||
| * | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-02 | 13 | -24/+87 |
| |\| | |||||
| | * | add links to change chat status and leave room | friendica | 2014-02-02 | 4 | -16/+36 |
| | | | |||||
| | * | add epub mimetype (application/epub+zip) | friendica | 2014-02-02 | 2 | -1/+2 |
| | | | |||||
| | * | fix default link color | friendica | 2014-02-01 | 2 | -2/+2 |
| | | | |||||
| | * | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-01 | 5 | -5/+13 |
| | |\ | |||||
| | | * | Merge pull request #296 from tazmandevil/master | friendica | 2014-02-01 | 4 | -3/+11 |
| | | |\ | | | | | | | | | link color | ||||
| | | | * | user configured link colour | Tazman DeVille | 2014-02-02 | 2 | -2/+2 |
| | | | | | |||||
| | | | * | link colours | Tazman DeVille | 2014-02-02 | 1 | -0/+1 |
| | | | | | |||||
| | | | * | link colour options | Tazman DeVille | 2014-02-02 | 4 | -3/+10 |
| | | | | | |||||
| | | * | | Merge pull request #294 from git-marijus/master | friendica | 2014-02-01 | 1 | -2/+2 |
| | | |\ \ | | | | | | | | | | | comment out since it is not clear if this is not implemented yet or obsolete | ||||
| | * | | | | provide donation options on siteinfo page | friendica | 2014-02-01 | 2 | -1/+18 |
| | |/ / / | |||||
| | * | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-01 | 2 | -1/+18 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | Merge pull request #295 from cvogeley/master | cvogeley | 2014-02-01 | 1 | -0/+17 |
| | | |\ \ | | | | | | | | | | | Press return to post chat posts- SHIFT-RETURN creates line break | ||||
| | | | * | | Press return to post chat posts- SHIFT-RETURN creates line break | Christian Vogeley | 2014-02-01 | 1 | -0/+17 |
| | | |/ / | | | | | | | | | | | | | on mobile devices keep default behavior | ||||
| | * | | | config: don't try to unserialise an array | friendica | 2014-02-01 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-01 | 97 | -2342/+3605 |
| |\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | |||||
| | * | | Doc - Make TOS include work. | Thomas Willingham | 2014-02-01 | 1 | -1/+1 |
| | |/ | |||||
| | * | status indication | friendica | 2014-02-01 | 2 | -2/+12 |
| | | | |||||
| | * | provide the room name for the room you're in. | friendica | 2014-02-01 | 3 | -2/+10 |
| | | | |||||
| | * | chat formatting/style improvements | friendica | 2014-01-31 | 1 | -2/+4 |
| | | | |||||
| | * | provide some interesting new options to channel sources | friendica | 2014-01-31 | 4 | -956/+1012 |
| | | | |||||
| | * | doc updates | friendica | 2014-01-31 | 89 | -1381/+2568 |
| | | | |||||
| * | | comment out since it is not clear if this is not implemented yet or obsolete | marijus | 2014-01-31 | 1 | -2/+2 |
| |/ | |||||
| * | keep presence updated - typo was causing it to logout | friendica | 2014-01-30 | 2 | -2/+2 |
| | | |||||
| * | missing string delimiters (quotes) | friendica | 2014-01-30 | 1 | -3/+3 |
| | | |||||
| * | chat expiration (default 2 hours) - but can be set on a per-chatroom basis | friendica | 2014-01-30 | 4 | -5/+22 |
| | | |||||
| * | mod/ping should only update basic_presence - and clearing stale entries. ↵ | friendica | 2014-01-30 | 1 | -9/+6 |
| | | | | | otherwise let rooms handle presence for themselves. | ||||
| * | more chat work - this time the ajax bits to actually show chats on the page | friendica | 2014-01-30 | 1 | -5/+34 |
| | | |||||
| * | 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 |
| | | |\ \ \ \ \ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |