Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-16 | 1 | -2/+2 |
|\ | |||||
| * | issue #386 - account and channel bulk edit checkboxes not visible and ↵ | redmatrix | 2015-08-16 | 1 | -2/+2 |
| | | | | | | | | therefore not useable. Also change wording to remove the offensive 'user' designation. | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 1 | -8/+5 |
|\| | | | | | | | | | Conflicts: mod/connedit.php | ||||
| * | css fixes | Mario Vavti | 2015-07-14 | 1 | -5/+1 |
| | | |||||
| * | cleanup connedit | Mario Vavti | 2015-07-14 | 1 | -8/+9 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-11 | 1 | -16/+6 |
|\| | |||||
| * | fix issue with profile photo | Mario Vavti | 2015-07-11 | 1 | -6/+6 |
| | | |||||
| * | more revert | Mario Vavti | 2015-07-11 | 1 | -5/+0 |
| | | |||||
| * | revert moving section and aside padding to style.css - it brings trouble to ↵ | Mario Vavti | 2015-07-11 | 1 | -5/+0 |
| | | | | | | | | other layouts | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-10 | 5 | -26/+41 |
|\| | | | | | | | | | | | | | | | Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php | ||||
| * | css fixes | Mario Vavti | 2015-07-10 | 1 | -2/+8 |
| | | |||||
| * | do not change selected/active class color on hover | Mario Vavti | 2015-07-10 | 1 | -1/+10 |
| | | |||||
| * | re-enable selected/active class | Mario Vavti | 2015-07-10 | 1 | -4/+3 |
| | | |||||
| * | add generic content wrapper to post/webpage editor and make editpost render ↵ | Mario Vavti | 2015-07-10 | 1 | -2/+2 |
| | | | | | | | | correctly | ||||
| * | schema focus: refine content width to be more in balance with the recent ↵ | Mario Vavti | 2015-07-10 | 1 | -1/+1 |
| | | | | | | | | aside width | ||||
| * | move section and aside padding from default.css to style.css | Mario Vavti | 2015-07-10 | 3 | -6/+5 |
| | | |||||
| * | fix vcard title spacing | Mario Vavti | 2015-07-09 | 1 | -1/+2 |
| | | |||||
| * | fix aside width for collapsed state | Mario Vavti | 2015-07-09 | 2 | -2/+2 |
| | | |||||
| * | move profile image up and refine the aside width | Mario Vavti | 2015-07-09 | 3 | -7/+8 |
| | | |||||
| * | remove padding | Mario Vavti | 2015-07-09 | 1 | -1/+0 |
| | | |||||
| * | increase width of the aside area and make default profile image size 300x300 | Mario Vavti | 2015-07-09 | 3 | -5/+6 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-07 | 3 | -6/+7 |
|\| | |||||
| * | schema focus: adjust width to match photo width in /photos | Mario Vavti | 2015-07-07 | 1 | -1/+1 |
| | | |||||
| * | various css fixes | Mario Vavti | 2015-07-07 | 2 | -5/+4 |
| | | |||||
| * | more word wrap fixes | Mario Vavti | 2015-07-07 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-05 | 1 | -1/+1 |
|\| | |||||
| * | schema focus: adjust default width | Mario Vavti | 2015-07-05 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 1 | -1/+5 |
|\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| * | Update NL + 1 revert css, see comment here: ↵ | jeroenpraat | 2015-06-30 | 1 | -1/+0 |
| | | | | | | | | https://github.com/redmatrix/redmatrix/commit/22b9e97ae2e46513c7a43cb27e7230bc5c40b9d4 | ||||
| * | Probably a ugly hack, but it's the only way I could found that cuts off very ↵ | jeroenpraat | 2015-06-29 | 1 | -0/+5 |
| | | | | | | | | long channel names in the admin area. If there's a better alternative, be my guest. | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 1 | -1/+6 |
|\| | | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-28 | 1 | -1/+5 |
| |\ | |||||
| | * | css fixes | Mario Vavti | 2015-06-27 | 1 | -1/+5 |
| | | | |||||
| * | | no this isn't it. well ok, it's part of it, but not the important part. it's ↵ | redmatrix | 2015-06-28 | 1 | -0/+1 |
| |/ | | | | | | | still pretty cool. | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-24 | 2 | -0/+92 |
|\| | | | | | | | | | | | | | Conflicts: doc/de/features.bb view/de/messages.po view/de/strings.php | ||||
| * | Add a new redbasic scheme called focus - It is supposed to focus on the main ↵ | Mario Vavti | 2015-06-24 | 2 | -0/+92 |
| | | | | | | | | content by adding a slight shadow and centering the main content on the screen. Also the default width of the content is set to 640px. | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-21 | 3 | -5/+16 |
|\| | | | | | | | | | | | Conflicts: include/items.php util/messages.po | ||||
| * | do not show default in scheme selection dropdown. default.php and ↵ | Mario Vavti | 2015-06-21 | 2 | -2/+5 |
| | | | | | | | | default.css should be symlinks. adjust doco accordingly. | ||||
| * | more generic-content-wrapper and some css fixes | Mario Vavti | 2015-06-19 | 1 | -3/+11 |
| | | |||||
* | | more work on items | redmatrix | 2015-06-11 | 3 | -4/+15 |
|\| | | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php | ||||
| * | set width for region_3 only if center page content is set | Mario Vavti | 2015-06-11 | 3 | -4/+15 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-10 | 2 | -6/+15 |
|\| | |||||
| * | assign right aside the same width as we have in left aside but hide it on ↵ | Mario Vavti | 2015-06-10 | 2 | -6/+15 |
| | | | | | | | | small and xs screens. make aside width a variablee for easier handling. | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 1 | -0/+12 |
|\| | | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php | ||||
| * | css regression fixes | Mario Vavti | 2015-06-08 | 1 | -0/+12 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-06 | 10 | -790/+616 |
|\| | | | | | | | | | Conflicts: util/messages.po | ||||
| * | missing comma | Mario Vavti | 2015-06-06 | 1 | -1/+1 |
| | | |||||
| * | css fixes | Mario Vavti | 2015-06-06 | 1 | -17/+9 |
| | | |||||
| * | whitespace | Mario Vavti | 2015-06-06 | 1 | -169/+175 |
| | | |||||
| * | some cleanup after scheme transition | Mario Vavti | 2015-06-06 | 2 | -196/+19 |
| | |