Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-19 | 1 | -45/+32 |
|\ | | | | | | | | | | | | | | | | | Conflicts: include/identity.php include/widgets.php util/messages.po view/it/messages.po view/it/strings.php | ||||
| * | fix missing div and a regression introduced in ↵ | Mario Vavti | 2015-07-16 | 1 | -45/+32 |
| | | | | | | | | ec23a94b6d7f6db1e1d34275b8143cbc947db802 which broke tag removal for photos | ||||
| * | Merge pull request #376 from tuscanhobbit/master | Paolo T | 2015-07-16 | 2 | -305/+369 |
| |\ | | | | | | | Updated Italian strings | ||||
| | * | Updated Italian strings | Paolo Tacconi | 2015-07-16 | 2 | -305/+369 |
| | | | |||||
* | | | the view_photos and post_photos permissions are redundant and are now mapped ↵ | redmatrix | 2015-07-19 | 2 | -9/+0 |
| | | | | | | | | | | | | to view_storage and write_storage | ||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 2 | -5/+8 |
|\| | | |||||
| * | | show inherited state in Connection Default Permissions | Mario Vavti | 2015-07-15 | 2 | -5/+8 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 7 | -437/+268 |
|\| | | | | | | | | | | | | | | Conflicts: mod/connedit.php | ||||
| * | | make strings translateable | Mario Vavti | 2015-07-14 | 1 | -6/+6 |
| | | | |||||
| * | | disable the inherited checkboxes for notself | Mario Vavti | 2015-07-14 | 1 | -1/+1 |
| | | | |||||
| * | | fix mod_connedit.js after cleanup | Mario Vavti | 2015-07-14 | 2 | -1/+35 |
| | | | |||||
| * | | revert this until further investigation | Mario Vavti | 2015-07-14 | 1 | -1/+1 |
| | | | |||||
| * | | css fixes | Mario Vavti | 2015-07-14 | 1 | -5/+1 |
| | | | |||||
| * | | cleanup connedit | Mario Vavti | 2015-07-14 | 7 | -469/+270 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-13 | 2 | -3/+3 |
|\| | | |||||
| * | | fix sys channel menu in a morre standard way | Mario Vavti | 2015-07-12 | 1 | -1/+1 |
| | | | |||||
| * | | make menu creation for sys channel work | Mario Vavti | 2015-07-12 | 2 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-11 | 3 | -16/+23 |
|\| | | |||||
| * | | 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 | 2 | -5/+14 |
| | | | | | | | | | | | | other layouts | ||||
| * | | add css file for mod display | Mario Vavti | 2015-07-11 | 1 | -0/+3 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-10 | 14 | -108/+131 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php | ||||
| * | | update Dutch strings | jeroenpraat | 2015-07-10 | 2 | -274/+336 |
| | | | |||||
| * | | 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 | 3 | -64/+72 |
| | | | |||||
| * | | add generic content wrapper to post/webpage editor and make editpost render ↵ | Mario Vavti | 2015-07-10 | 2 | -12/+14 |
| | | | | | | | | | | | | 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 |
| | | | |||||
| * | | 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 | 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 | 5 | -8/+9 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-07 | 11 | -30/+35 |
|\| | | |||||
| * | | fix sorting of channel suggestions | Mario Vavti | 2015-07-07 | 1 | -4/+4 |
| | | | |||||
| * | | rename function get_directory_settings => get_directory_setting and move ↵ | Mario Vavti | 2015-07-07 | 2 | -7/+12 |
| | | | | | | | | | | | | sort options to directory title bar | ||||
| * | | 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 |
| | | | |||||
| * | | use default style for default webpage | Mario Vavti | 2015-07-07 | 1 | -7/+12 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | 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 |
| | | | |||||
* | | | 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 |
| |/ | |||||
| * | Updated Italian localization | Paolo Tacconi | 2015-07-03 | 2 | -7065/+7315 |
| | | |||||
* | | sync abook entries from redmatrix | redmatrix | 2015-07-02 | 2 | -2/+3 |
|\| | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php |