Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-03 | 2 | -37/+1 |
|\ | |||||
| * | code cleanup - remove some unused functions | friendica | 2014-02-03 | 2 | -37/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-03 | 19 | -95/+221 |
|\| | |||||
| * | The problem with a lot of packages is that it's easier to re-write them than ↵ | friendica | 2014-02-02 | 2 | -4/+39 |
| | | | | | | | | to re-use them. | ||||
| * | more wordsmithing | friendica | 2014-02-02 | 1 | -1/+1 |
| | | |||||
| * | changed order of the privacy macros so that the dangerous settings come last ↵ | friendica | 2014-02-02 | 1 | -1/+1 |
| | | | | | | | | and the preferred settings come first | ||||
| * | don't load any configs from DB if installing - especially in style.pcss | friendica | 2014-02-02 | 3 | -6/+11 |
| | | |||||
| * | wordsmithing | friendica | 2014-02-02 | 1 | -4/+4 |
| | | |||||
| * | don't draw attention to advanced permissions and their corresponding ↵ | friendica | 2014-02-02 | 6 | -24/+62 |
| | | | | | | | | complexity and clearly mark the simple permissions which people are encouraged to use. | ||||
| * | Merge pull request #300 from tazmandevil/master | friendica | 2014-02-02 | 2 | -3/+43 |
| |\ | | | | | | | added Thomas' additional navbar colours from APW to redbasic | ||||
| | * | added Thomas' additional navbar colours from APW to redbasic | Tazman DeVille | 2014-02-03 | 2 | -3/+43 |
| |/ | |||||
| * | minor text change "can" -> "may" | friendica | 2014-02-02 | 1 | -2/+2 |
| | | |||||
| * | Add switch to allow menus to be used as bookmark collections | friendica | 2014-02-02 | 3 | -2/+6 |
| | | |||||
| * | remove the text "requires compatible chat plugin" | friendica | 2014-02-02 | 1 | -1/+1 |
| | | |||||
| * | make chat honour the pause key (but we still need to ping the server to ↵ | friendica | 2014-02-02 | 3 | -51/+55 |
| | | | | | | | | maintain the in_room status), also the recent change to pull css out of the template file used classes instead of ids so none of the styles were sticking | ||||
* | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-02 | 3 | -10/+21 |
|\| | |||||
| * | better check for setup module | friendica | 2014-02-02 | 1 | -1/+1 |
| | | |||||
| * | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-02 | 4 | -20/+44 |
| |\ | |||||
| * | | some windows fixes | friendica | 2014-02-02 | 3 | -10/+21 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-02 | 1 | -10/+8 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #299 from toclimb/smilies-fix | friendica | 2014-02-02 | 1 | -10/+8 |
| |\ \ | | | | | | | | | More efficient smilie replacing (see pull request #291) | ||||
| | * | | More efficient smilie replacing | toclimb | 2014-02-02 | 1 | -10/+8 |
| | |/ | |||||
* | | | 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 |
| |