Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-31 | 13 | -59/+57 |
|\ | |||||
| * | triple a is more sane | Mario Vavti | 2017-03-31 | 1 | -1/+1 |
| | | |||||
| * | minor css adjustments | Mario Vavti | 2017-03-31 | 1 | -1/+5 |
| | | |||||
| * | various form css fixes | Mario Vavti | 2017-03-31 | 10 | -42/+38 |
| | | |||||
| * | make btn-outline-secondary color slightly darker | Mario Vavti | 2017-03-31 | 1 | -0/+4 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-03-31 | 2 | -7/+2 |
| |\ | |||||
| | * | Merge pull request #710 from dawnbreak/importcsrf | git-marijus | 2017-03-31 | 2 | -7/+2 |
| | |\ | | | | | | | | | :lock: Add CSRF protection for import and import_items. | ||||
| * | | | css fixes | Mario Vavti | 2017-03-31 | 3 | -17/+9 |
| |/ / | |||||
| * | | add max height to #navbar-collapse-2 | Mario Vavti | 2017-03-31 | 2 | -0/+2 |
| | | | |||||
* | | | Merge branch 'importcsrf' of https://github.com/dawnbreak/hubzilla into csrf | zotlabs | 2017-03-30 | 2 | -7/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | :lock: Add CSRF protection for import and import_items. | Klaus Weidenbach | 2017-03-30 | 2 | -7/+2 |
| |/ | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-30 | 3 | -48/+22 |
|\| | |||||
| * | more css fixes | Mario Vavti | 2017-03-30 | 2 | -1/+5 |
| | | |||||
| * | css fixes | Mario Vavti | 2017-03-30 | 2 | -47/+17 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-29 | 4 | -7/+15 |
|\| | |||||
| * | css fixes | Mario Vavti | 2017-03-29 | 1 | -2/+11 |
| | | |||||
| * | allow setting the system email name/address/reply | zotlabs | 2017-03-29 | 1 | -0/+5 |
| | | |||||
| * | begin the process of using the relevant attach directory/path for photo ↵ | zotlabs | 2017-03-29 | 1 | -3/+3 |
| | | | | | | | | albums instead of an album basename which may not be unique. Created an 'ellipsify()' function to shorten long names and keep the beginning and end intact | ||||
| * | more markdown purification | zotlabs | 2017-03-29 | 1 | -2/+1 |
| | | |||||
| * | even more fine tuning of the markdown purifier - especially when used with ↵ | zotlabs | 2017-03-29 | 1 | -1/+1 |
| | | | | | | | | the wiki | ||||
| * | various input filter fixes | zotlabs | 2017-03-29 | 1 | -1/+2 |
| | | |||||
| * | dim class was un-themed | zotlabs | 2017-03-29 | 2 | -4/+4 |
| | | |||||
| * | remove the unimplemented upload limit site settings | zotlabs | 2017-03-29 | 1 | -3/+0 |
| | | |||||
| * | namespace error | Mario Vavti | 2017-03-29 | 1 | -1/+0 |
| | | |||||
* | | scaling issue with fa-th and fa-bars icons when using boostrap-red.css:37 ↵ | zotlabs | 2017-03-28 | 1 | -1/+1 |
| | | | | | | | | #navbar-collapse-1 i { font-size 1.0rem; }; FF 52.0.1 on Win7; 0.9rem and 1.1rem both render much better. 1.1 is a bit large so going with 0.9 | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-28 | 11 | -41/+61 |
|\| | |||||
| * | minor bs4 fixes | Mario Vavti | 2017-03-28 | 4 | -12/+12 |
| | | |||||
| * | some fixes for latest bs-dev | Mario Vavti | 2017-03-28 | 4 | -2/+12 |
| | | |||||
| * | fixes for latest bootstrap | Mario Vavti | 2017-03-28 | 4 | -24/+30 |
| | | |||||
| * | update to latest bs-dev | Mario Vavti | 2017-03-28 | 4 | -7/+7 |
| | | |||||
| * | links in wall-item-title must have white colour if the background is bg-primary | Mario Vavti | 2017-03-28 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-27 | 9 | -78/+40 |
|\| | |||||
| * | adjust comment box | Mario Vavti | 2017-03-27 | 1 | -2/+3 |
| | | |||||
| * | fix app rendering | Mario Vavti | 2017-03-27 | 4 | -8/+6 |
| | | |||||
| * | unify css classes | Mario Vavti | 2017-03-27 | 3 | -44/+16 |
| | | |||||
| * | css fixes | Mario Vavti | 2017-03-27 | 3 | -31/+22 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-26 | 8 | -204/+33 |
|\| | |||||
| * | fix app-icon color and use bs class for w100 | Mario Vavti | 2017-03-26 | 3 | -6/+3 |
| | | |||||
| * | fix nav menu caret | Mario Vavti | 2017-03-26 | 2 | -5/+8 |
| | | |||||
| * | fix and cleanup custom theme settings | Mario Vavti | 2017-03-26 | 6 | -180/+20 |
| | | |||||
| * | minor css cleanup | Mario Vavti | 2017-03-26 | 1 | -19/+8 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-25 | 130 | -2100/+1529 |
|\| | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-03-25 | 2 | -3/+3 |
| |\ | |||||
| | * | fix active state | Mario Vavti | 2017-03-24 | 2 | -3/+3 |
| | | | |||||
| * | | fix full template nav | Mario Vavti | 2017-03-25 | 1 | -1/+1 |
| |/ | |||||
| * | remove obsolete todo | Mario Vavti | 2017-03-24 | 1 | -2/+0 |
| | | |||||
| * | remove redundant css | Mario Vavti | 2017-03-24 | 1 | -13/+0 |
| | | |||||
| * | fix some active and hover colors | Mario Vavti | 2017-03-24 | 1 | -2/+15 |
| | | |||||
| * | missing badge-default class | Mario Vavti | 2017-03-24 | 2 | -3/+3 |
| | | |||||
| * | must be 1.35rem | Mario Vavti | 2017-03-24 | 1 | -1/+1 |
| | |