aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-284-3/+16
|\
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-282-1/+7
| |\
| | * css fixesMario Vavti2015-06-272-1/+7
| * | no this isn't it. well ok, it's part of it, but not the important part. it's ...redmatrix2015-06-282-2/+7
| |/
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-06-252-2656/+2815
| |\
| * | 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-242-0/+92
|\ \ \ | | |/ | |/|
| * | update to German stringszottel2015-06-242-2656/+2815
| |/
| * Add a new redbasic scheme called focus - It is supposed to focus on the main ...Mario Vavti2015-06-242-0/+92
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-236-118/+99
|\|
| * some work on directoryMario Vavti2015-06-235-116/+92
| * 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-2120-308/+345
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-211-2/+2
| |\
| | * Compatible update for .htaccess.Klaus Weidenbach2015-06-221-2/+8
| * | some diaspora import issues uncovered during dry-run testsredmatrix2015-06-211-0/+3
| * | Compatible update for .htaccess.Klaus Weidenbach2015-06-211-2/+8
| |/
| * do not show default in scheme selection dropdown. default.php and default.css...Mario Vavti2015-06-213-3/+6
| * more generic-content-wrapper and some css fixesMario Vavti2015-06-193-35/+44
| * 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-154-158/+187
|\|
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-06-152-6998/+7222
| |\
| | * Update Dutch language stringsjeroenpraat2015-06-152-6998/+7222
| * | update spin.jsMario Vavti2015-06-152-157/+184
| |/
| * do not allow/show acl button on photo edit if not ownerMario Vavti2015-06-152-1/+3
* | more work on itemsredmatrix2015-06-115-6/+19
|\|
| * Merge pull request #347 from tuscanhobbit/devPaolo T2015-06-112-7219/+7160
| |\
| | * updated italian stringsPaolo Tacconi2015-06-112-7219/+7160
| * | set width for region_3 only if center page content is setMario Vavti2015-06-113-4/+15
| * | fix rendering of affinity sliderMario Vavti2015-06-112-2/+4
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-104-11/+18
|\| |
| * | assign right aside the same width as we have in left aside but hide it on sma...Mario Vavti2015-06-104-11/+18
* | | 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 p...redmatrix2015-06-091-0/+1
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-093-2/+15
|\| |
| * | css regression fixesMario Vavti2015-06-081-0/+12
| * | Merge branch 'frontpage'redmatrix2015-06-072-2/+3
| |\ \
| | * | more frontpage tweaksredmatrix2015-06-071-1/+1
| | * | reverse logic of homepage login settingredmatrix2015-06-071-1/+1
| | * | frontpage tweaksredmatrix2015-06-071-0/+1
| | * | frontpage changesredmatrix2015-06-071-1/+1
| * | | Upd NLjeroenpraat2015-06-072-7229/+7132
| |/ /
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-0611-793/+619
|\| |
| * | missing commaMario Vavti2015-06-061-1/+1
| * | Added translatable strings to the Display Settings page and refreshed util/me...jeroenpraat2015-06-061-3/+3