Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'redmatrix/master' | Mario Vavti | 2015-07-11 | 1 | -0/+3 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-07-11 | 2 | -169/+171 |
| |\ | |||||
| * | | add css file for mod display | Mario Vavti | 2015-07-11 | 1 | -0/+3 |
| | | | |||||
* | | | merge | Mario Vavti | 2015-07-11 | 2 | -2/+5 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-10 | 22 | -135/+164 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php | ||||
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-10 | 23 | -409/+499 |
| | |\| | |||||
| | | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-07-10 | 2 | -274/+336 |
| | | |\ | |||||
| | | | * | update Dutch strings | jeroenpraat | 2015-07-10 | 2 | -274/+336 |
| | | | | | |||||
| | | * | | show status editor in /display on share action. | Mario Vavti | 2015-07-10 | 1 | -1/+4 |
| | | |/ | |||||
| | * | | revision update | redmatrix | 2015-07-10 | 2 | -169/+171 |
| | | | | |||||
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-07 | 15 | -87/+80 |
| | |\ \ | |||||
| | * | | | version update | redmatrix | 2015-07-07 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | merge redmatrix fixes | Mario Vavti | 2015-07-10 | 21 | -134/+159 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | 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 |
| | | | | |||||
| * | | | more webpages - generic-content-wrapper fixes | Mario Vavti | 2015-07-10 | 6 | -79/+90 |
| | | | | |||||
| * | | | add generic content wrapper to post/webpage editor and make editpost render ↵ | Mario Vavti | 2015-07-10 | 3 | -20/+20 |
| | | | | | | | | | | | | | | | | 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 | 4 | -8/+6 |
| | | | | |||||
| * | | | revert | Mario Vavti | 2015-07-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | do not show status editor in /display - we most probably want to read the thread or comment. | ||||
| * | | | fix vcard title spacing | Mario Vavti | 2015-07-09 | 1 | -1/+2 |
| | | | | |||||
| * | | | do not show status editor in /display - we most probably want to read the ↵ | Mario Vavti | 2015-07-09 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | thread or comment. | ||||
| * | | | 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 | 6 | -11/+11 |
| | | | | |||||
| * | | | 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 | 7 | -11/+12 |
| | | | | |||||
| * | | | fix typo to make directory safe mode default to on work again | Mario Vavti | 2015-07-08 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | inconsistent naming of block item types | redmatrix | 2015-07-08 | 4 | -6/+6 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-07 | 15 | -87/+80 |
|\| | | |||||
| * | | fix sorting of channel suggestions | Mario Vavti | 2015-07-07 | 3 | -5/+6 |
| | | | |||||
| * | | rename function get_directory_settings => get_directory_setting and move ↵ | Mario Vavti | 2015-07-07 | 5 | -32/+26 |
| | | | | | | | | | | | | sort options to directory title bar | ||||
| * | | make public forums only setting sticky and simplify function to get ↵ | Mario Vavti | 2015-07-07 | 3 | -39/+34 |
| | | | | | | | | | | | | directory settings | ||||
| * | | code style correction | Mario Vavti | 2015-07-07 | 1 | -3/+2 |
| | | | |||||
| * | | make directory suggest work with directory options | Mario Vavti | 2015-07-07 | 2 | -3/+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 | 7 | -15/+8 |
| | | | |||||
| * | | more word wrap fixes | Mario Vavti | 2015-07-07 | 1 | -0/+2 |
| | | | |||||
| * | | move if clause outside of the div | Mario Vavti | 2015-07-07 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-07-07 | 1 | -1/+1 |
| |\| | |||||
| * | | use default style for default webpage | Mario Vavti | 2015-07-07 | 1 | -7/+12 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | redmatrix | 2015-07-07 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge pull request #4 from git-marijus/master | redmatrix | 2015-07-08 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | abook_pending should probably be 1 in this place | ||||
| | * | | | abook_pending should probably be 1 in this place | Mario Vavti | 2015-07-06 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | incorrect value for hubloc_deleted in zot_get_hublocs() query | redmatrix | 2015-07-07 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | incorrectly named doc file | redmatrix | 2015-07-06 | 1 | -0/+0 |
| | | | | |||||
* | | | | ok that's wretchedly inefficient but provides a basic relevance search for ↵ | redmatrix | 2015-07-06 | 2 | -2/+34 |
| | | | | | | | | | | | | | | | | strings in doc files. | ||||
* | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-06 | 2 | -1/+5 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-06 | 1 | -0/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | fix word wrapping in tagblock and dirtagblock and possibly other places | Mario Vavti | 2015-07-06 | 1 | -0/+4 |
| | | | |