aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-271-6/+5
|\
| * align buttons on event calendarredmatrix2015-07-271-6/+5
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-271-0/+13
|\| | | | | | | | | Conflicts: util/messages.po
| * crude but more or less functional event import from thunderbird ics filesredmatrix2015-07-261-0/+13
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-261-0/+9
|\| | | | | | | | | | | | | Conflicts: mod/connedit.php view/pt-br/messages.po view/pt-br/strings.php
| * Provide connection status if status is "a-normal"Mario Vavti2015-07-261-0/+9
| |
| * update pt-br stringsAlexandre Hannud Abdo2015-07-242-3156/+3297
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-212-3/+8
|\| | | | | | | | | Conflicts: doc/to_do_code.bb
| * Fixes regarding the new default profile photo size. The default profile ↵Mario Vavti2015-07-201-1/+1
| | | | | | | | photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format.
| * show icons instead of disabled checkboxesMario Vavti2015-07-201-2/+7
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-191-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 Vavti2015-07-161-45/+32
| | | | | | | | ec23a94b6d7f6db1e1d34275b8143cbc947db802 which broke tag removal for photos
| * Merge pull request #376 from tuscanhobbit/masterPaolo T2015-07-162-305/+369
| |\ | | | | | | Updated Italian strings
| | * Updated Italian stringsPaolo Tacconi2015-07-162-305/+369
| | |
* | | the view_photos and post_photos permissions are redundant and are now mapped ↵redmatrix2015-07-192-9/+0
| | | | | | | | | | | | to view_storage and write_storage
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-152-5/+8
|\| |
| * | show inherited state in Connection Default PermissionsMario Vavti2015-07-152-5/+8
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-147-437/+268
|\| | | | | | | | | | | | | | Conflicts: mod/connedit.php
| * | make strings translateableMario Vavti2015-07-141-6/+6
| | |
| * | disable the inherited checkboxes for notselfMario Vavti2015-07-141-1/+1
| | |
| * | fix mod_connedit.js after cleanupMario Vavti2015-07-142-1/+35
| | |
| * | revert this until further investigationMario Vavti2015-07-141-1/+1
| | |
| * | css fixesMario Vavti2015-07-141-5/+1
| | |
| * | cleanup conneditMario Vavti2015-07-147-469/+270
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-132-3/+3
|\| |
| * | fix sys channel menu in a morre standard wayMario Vavti2015-07-121-1/+1
| | |
| * | make menu creation for sys channel workMario Vavti2015-07-122-3/+3
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-113-16/+23
|\| |
| * | fix issue with profile photoMario Vavti2015-07-111-6/+6
| | |
| * | more revertMario Vavti2015-07-111-5/+0
| | |
| * | revert moving section and aside padding to style.css - it brings trouble to ↵Mario Vavti2015-07-112-5/+14
| | | | | | | | | | | | other layouts
| * | add css file for mod displayMario Vavti2015-07-111-0/+3
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-1014-108/+131
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php
| * | update Dutch stringsjeroenpraat2015-07-102-274/+336
| | |
| * | css fixesMario Vavti2015-07-101-2/+8
| | |
| * | do not change selected/active class color on hoverMario Vavti2015-07-101-1/+10
| | |
| * | re-enable selected/active classMario Vavti2015-07-101-4/+3
| | |
| * | more webpages - generic-content-wrapper fixesMario Vavti2015-07-103-64/+72
| | |
| * | add generic content wrapper to post/webpage editor and make editpost render ↵Mario Vavti2015-07-102-12/+14
| | | | | | | | | | | | correctly
| * | schema focus: refine content width to be more in balance with the recent ↵Mario Vavti2015-07-101-1/+1
| | | | | | | | | | | | aside width
| * | move section and aside padding from default.css to style.cssMario Vavti2015-07-104-8/+6
| | |
| * | fix vcard title spacingMario Vavti2015-07-091-1/+2
| | |
| * | fix aside width for collapsed stateMario Vavti2015-07-092-2/+2
| | |
| * | move profile image up and refine the aside widthMario Vavti2015-07-096-11/+11
| | |
| * | remove paddingMario Vavti2015-07-091-1/+0
| | |
| * | increase width of the aside area and make default profile image size 300x300Mario Vavti2015-07-095-8/+9
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-0711-30/+35
|\| |
| * | fix sorting of channel suggestionsMario Vavti2015-07-071-4/+4
| | |
| * | rename function get_directory_settings => get_directory_setting and move ↵Mario Vavti2015-07-072-7/+12
| | | | | | | | | | | | sort options to directory title bar
| * | schema focus: adjust width to match photo width in /photosMario Vavti2015-07-071-1/+1
| | |