aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
Commit message (Collapse)AuthorAgeFilesLines
* some event related fixes and some base work for implementing native tasks ↵redmatrix2015-08-201-8/+1
| | | | (to-do lists); which should already be importable and exportable.
* issues encountered whilst testing import_items module using yearly dump filesredmatrix2015-08-171-1/+1
|
* provide module for importing yearly content dumpsredmatrix2015-08-171-0/+15
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-172-3/+3
|\ | | | | | | | | Conflicts: view/nl/messages.po
| * commit 631eb4b broke the checkboxes in admin/site, so separate normal ↵redmatrix2015-08-172-3/+3
| | | | | | | | checkboxes from bulk edit checkboxes in the css
* | more work separating Diaspora from coreredmatrix2015-08-032-24/+0
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-311-1/+1
|\| | | | | | | | | Conflicts: util/messages.po
| * consistency of event formredmatrix2015-07-311-1/+1
| |
* | 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
| |
* | 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 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 04:38:19 +0000