aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tresredmatrix2015-05-1456-8598/+8554
|\
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-109-74/+86
| |\
| | * provide drop down submenu suggestions in edit modeMario Vavti2015-05-101-0/+2
| | * copy/paste typoMario Vavti2015-05-101-1/+1
| | * provide ability to create submenusMario Vavti2015-05-106-8/+18
| | * update to German stringszottel2015-05-082-5226/+5453
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-075-227/+242
| |\|
| | * provide wrap variable for comanche menusMario Vavti2015-05-071-1/+5
| | * Update Dutchjeroenpraat2015-05-072-221/+232
| | * adjust icon sizeMario Vavti2015-05-072-5/+5
| * | missed one...redmatrix2015-05-061-1/+1
| * | change notification colourredmatrix2015-05-061-1/+1
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-063-0/+28
| |\|
| | * allow blocks to have custom classes and add a new template called zen which g...Mario Vavti2015-05-061-0/+10
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-055-8101/+8002
| | |\
| | * | turn consensus items into diaspora polls for that networkredmatrix2015-05-052-0/+18
| * | | second pass name changeredmatrix2015-05-0543-236/+236
| * | | first pass name changeredmatrix2015-05-0522-363/+363
| | |/ | |/|
| * | Merge pull request #317 from tuscanhobbit/devPaolo T2015-05-042-4048/+3998
| |\ \
| | * | Italian translationPaolo Tacconi2015-05-042-4048/+3998
| * | | fix center page content settingMario Vavti2015-05-041-1/+2
| * | | Updating Dutchjeroenpraat2015-05-022-4052/+4002
| | |/ | |/|
* | | Merge branch 'master' into tresfriendica2015-04-298-21/+102
|\| |
| * | fix block viewMario Vavti2015-04-291-1/+1
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-281-1/+0
| |\ \
| | * | revert some changes in justified galleryMario Vavti2015-04-281-1/+0
| * | | version updatefriendica2015-04-281-1/+1
| |/ /
| * | Provide webpage layout descriptionMario Vavti2015-04-252-4/+12
| * | css fixesMario Vavti2015-04-242-0/+8
| * | provide block titles in blocklistMario Vavti2015-04-242-7/+11
| * | webpages layout fixesMario Vavti2015-04-243-13/+75
* | | Merge branch 'master' into tresfriendica2015-04-23160-28987/+32063
|\| |
| * | webpages blocks fixesMario Vavti2015-04-234-24/+95
| * | provide headings for blocks and layoutsMario Vavti2015-04-224-2/+36
| * | missing classMario Vavti2015-04-211-1/+1
| * | move .lockview to style.css and a typoMario Vavti2015-04-212-5/+5
| * | missing dropdown classMario Vavti2015-04-211-1/+1
| * | bring lockstate to webpagesMario Vavti2015-04-212-4/+7
| * | bring lockview to menu items, slightly change the way /lockview is calledMario Vavti2015-04-217-21/+20
| * | rework and hopefully improve webpage menu creation workflowMario Vavti2015-04-219-93/+138
| * | issue #162friendica2015-04-202-1/+2
| * | attach an id to menues, allow $menu_title to be empty, if no custom menu clas...Mario Vavti2015-04-192-16/+12
| * | Introduce wrap variable in comanche blocks (if set to none the block will not...Mario Vavti2015-04-191-1/+1
| * | css fixMario Vavti2015-04-181-1/+1
| * | fix page-title marginMario Vavti2015-04-181-0/+4
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-176-34/+26
| |\ \
| | * | adjus webpage font size to match conv item font sizeMario Vavti2015-04-171-1/+2
| | * | allow jot to be displayed expanded, remove deprected datetimepicker js and so...Mario Vavti2015-04-176-33/+24
| * | | hide event share button when editing an eventfriendica2015-04-171-0/+4
| |/ /
| * | wording and css fixesMario Vavti2015-04-161-3/+2