aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
Commit message (Collapse)AuthorAgeFilesLines
* more work on itemsredmatrix2015-06-111-0/+3
|\ | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
| * fix rendering of affinity sliderMario Vavti2015-06-111-0/+3
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-092-0/+2
|\|
| * put mirror_frontpage setting into admin/siteredmatrix2015-06-091-0/+1
| |
| * toggle diaspora protocol on a per-channel level in addition to the existing ↵redmatrix2015-06-091-0/+1
| | | | | | | | per site setting. Default is enabled if the site setting is enabled.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-091-1/+2
|\| | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php
| * more frontpage tweaksredmatrix2015-06-071-1/+1
| |
| * reverse logic of homepage login settingredmatrix2015-06-071-1/+1
| |
| * frontpage tweaksredmatrix2015-06-071-0/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-061-3/+3
|\| | | | | | | | | Conflicts: util/messages.po
| * Added translatable strings to the Display Settings page and refreshed ↵jeroenpraat2015-06-061-3/+3
| | | | | | | | util/messages.po.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-313-9/+15
|\|
| * add some yes/no labels and minor template fixesMario Vavti2015-05-292-3/+3
| |
| * some fixes to make menu sharing work and expose it in the ui.Mario Vavti2015-05-291-8/+10
| |
| * show created/edited dates for menusMario Vavti2015-05-291-2/+6
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-251-1/+2
|\|
| * add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle ↵redmatrix2015-05-251-1/+2
| | | | | | | | the censor flag from that page.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-201-0/+3
|\| | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po
| * PRIVACY: possible privacy leakage under a defined set of circumstancesredmatrix2015-05-201-0/+3
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-103-3/+14
|\| | | | | | | | | | | | | Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php
| * 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-104-4/+13
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-071-1/+5
|\|
| * provide wrap variable for comanche menusMario Vavti2015-05-071-1/+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-062-0/+18
|\|
| * turn consensus items into diaspora polls for that networkredmatrix2015-05-052-0/+18
| |
* | second pass name changeredmatrix2015-05-052-3/+3
| |
* | first pass name changeredmatrix2015-05-052-2/+2
|/
* fix block viewMario Vavti2015-04-291-1/+1
|
* version updatefriendica2015-04-281-1/+1
|
* Provide webpage layout descriptionMario Vavti2015-04-251-1/+5
|
* provide block titles in blocklistMario Vavti2015-04-241-3/+7
|
* webpages layout fixesMario Vavti2015-04-241-13/+45
|
* webpages blocks fixesMario Vavti2015-04-232-24/+65
|
* provide headings for blocks and layoutsMario Vavti2015-04-222-2/+30
|
* missing classMario Vavti2015-04-211-1/+1
|
* missing dropdown classMario Vavti2015-04-211-1/+1
|
* bring lockstate to webpagesMario Vavti2015-04-211-0/+3
|
* bring lockview to menu items, slightly change the way /lockview is calledMario Vavti2015-04-216-19/+18
|
* rework and hopefully improve webpage menu creation workflowMario Vavti2015-04-216-80/+115
|
* issue #162friendica2015-04-201-0/+1
|
* attach an id to menues, allow $menu_title to be empty, if no custom menu ↵Mario Vavti2015-04-191-15/+12
| | | | class is provided use default redbasic classes
* Introduce wrap variable in comanche blocks (if set to none the block will ↵Mario Vavti2015-04-191-1/+1
| | | | not be wrapped in a div), fix menu item permissions (it was not possible to set them visible for everybody) and a typo
* Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-174-18/+14
|\
| * allow jot to be displayed expanded, remove deprected datetimepicker js and ↵Mario Vavti2015-04-174-18/+14
| | | | | | | | some random fixes
* | hide event share button when editing an eventfriendica2015-04-171-0/+4
|/
* provide a separate input field for rpost attachmentsMario Vavti2015-04-164-8/+17
|