aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
Commit message (Collapse)AuthorAgeFilesLines
* 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-144-151/+253
|\| | | | | | | | | 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-141-1/+1
| |
| * revert this until further investigationMario Vavti2015-07-141-1/+1
| |
| * cleanup conneditMario Vavti2015-07-144-150/+252
| |
* | 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-107-79/+88
|\| | | | | | | | | | | | | | | Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php
| * 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-101-10/+12
| | | | | | | | correctly
| * move profile image up and refine the aside widthMario Vavti2015-07-092-3/+2
| |
| * increase width of the aside area and make default profile image size 300x300Mario Vavti2015-07-091-2/+2
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-077-20/+28
|\|
| * 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
| * various css fixesMario Vavti2015-07-074-6/+4
| |
| * move if clause outside of the divMario Vavti2015-07-071-2/+2
| |
| * use default style for default webpageMario Vavti2015-07-071-7/+12
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-291-0/+5
|\|
| * turn the connection filter into a feature.redmatrix2015-06-291-0/+5
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-291-2/+2
|\| | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * fix directory locationMario Vavti2015-06-291-2/+2
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-282-2/+8
|\| | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po
| * no this isn't it. well ok, it's part of it, but not the important part. it's ↵redmatrix2015-06-281-2/+6
| | | | | | | | still pretty cool.
| * directory: only provide connect button if we are not already connectedMario Vavti2015-06-241-0/+2
| |
* | localise event calendarredmatrix2015-06-252-0/+25
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-233-56/+84
|\| | | | | | | | | | | Conflicts: include/items.php mod/item.php
| * some work on directoryMario Vavti2015-06-232-54/+77
| |
| * Bring /help in line with the rest of the appMario Vavti2015-06-221-2/+7
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-2116-301/+321
|\| | | | | | | | | | | Conflicts: include/items.php util/messages.po
| * some diaspora import issues uncovered during dry-run testsredmatrix2015-06-211-0/+3
| |
| * do not show default in scheme selection dropdown. default.php and ↵Mario Vavti2015-06-211-1/+1
| | | | | | | | default.css should be symlinks. adjust doco accordingly.
| * more generic-content-wrapper and some css fixesMario Vavti2015-06-192-32/+33
| |
| * cloud.tplMario Vavti2015-06-191-0/+4
| |
| * bring some more generic-content-wrappers and fix some of themMario Vavti2015-06-1911-268/+280
| |
* | more photos workredmatrix2015-06-171-1/+1
| |
* | lots of work on merging photo and file albums/foldersredmatrix2015-06-171-0/+3
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-152-1/+3
|\| | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * do not allow/show acl button on photo edit if not ownerMario Vavti2015-06-152-1/+3
| |
* | 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 10:42:52 +0000