| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 2 | -3/+7 |
|\ |
|
| * | Update NL + 1 revert css, see comment here: https://github.com/redmatrix/redm... | jeroenpraat | 2015-06-30 | 3 | -348/+374 |
| * | Probably a ugly hack, but it's the only way I could found that cuts off very ... | jeroenpraat | 2015-06-29 | 1 | -0/+5 |
| * | fix directory location | Mario Vavti | 2015-06-29 | 1 | -2/+2 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 4 | -3/+16 |
|\| |
|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-28 | 2 | -1/+7 |
| |\ |
|
| | * | css fixes | Mario Vavti | 2015-06-27 | 2 | -1/+7 |
| * | | no this isn't it. well ok, it's part of it, but not the important part. it's ... | redmatrix | 2015-06-28 | 2 | -2/+7 |
| |/ |
|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-25 | 2 | -2656/+2815 |
| |\ |
|
| * | | directory: only provide connect button if we are not already connected | Mario Vavti | 2015-06-24 | 1 | -0/+2 |
* | | | localise event calendar | redmatrix | 2015-06-25 | 2 | -0/+25 |
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-24 | 2 | -0/+92 |
|\ \ \
| | |/
| |/| |
|
| * | | update to German strings | zottel | 2015-06-24 | 2 | -2656/+2815 |
| |/ |
|
| * | Add a new redbasic scheme called focus - It is supposed to focus on the main ... | Mario Vavti | 2015-06-24 | 2 | -0/+92 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-23 | 6 | -118/+99 |
|\| |
|
| * | some work on directory | Mario Vavti | 2015-06-23 | 5 | -116/+92 |
| * | Bring /help in line with the rest of the app | Mario Vavti | 2015-06-22 | 1 | -2/+7 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-21 | 20 | -308/+345 |
|\| |
|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-21 | 1 | -2/+2 |
| |\ |
|
| | * | Compatible update for .htaccess. | Klaus Weidenbach | 2015-06-22 | 1 | -2/+8 |
| * | | some diaspora import issues uncovered during dry-run tests | redmatrix | 2015-06-21 | 1 | -0/+3 |
| * | | Compatible update for .htaccess. | Klaus Weidenbach | 2015-06-21 | 1 | -2/+8 |
| |/ |
|
| * | do not show default in scheme selection dropdown. default.php and default.css... | Mario Vavti | 2015-06-21 | 3 | -3/+6 |
| * | more generic-content-wrapper and some css fixes | Mario Vavti | 2015-06-19 | 3 | -35/+44 |
| * | cloud.tpl | Mario Vavti | 2015-06-19 | 1 | -0/+4 |
| * | bring some more generic-content-wrappers and fix some of them | Mario Vavti | 2015-06-19 | 11 | -268/+280 |
* | | more photos work | redmatrix | 2015-06-17 | 1 | -1/+1 |
* | | lots of work on merging photo and file albums/folders | redmatrix | 2015-06-17 | 1 | -0/+3 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-15 | 4 | -158/+187 |
|\| |
|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-15 | 2 | -6998/+7222 |
| |\ |
|
| | * | Update Dutch language strings | jeroenpraat | 2015-06-15 | 2 | -6998/+7222 |
| * | | update spin.js | Mario Vavti | 2015-06-15 | 2 | -157/+184 |
| |/ |
|
| * | do not allow/show acl button on photo edit if not owner | Mario Vavti | 2015-06-15 | 2 | -1/+3 |
* | | more work on items | redmatrix | 2015-06-11 | 5 | -6/+19 |
|\| |
|
| * | Merge pull request #347 from tuscanhobbit/dev | Paolo T | 2015-06-11 | 2 | -7219/+7160 |
| |\ |
|
| | * | updated italian strings | Paolo Tacconi | 2015-06-11 | 2 | -7219/+7160 |
| * | | set width for region_3 only if center page content is set | Mario Vavti | 2015-06-11 | 3 | -4/+15 |
| * | | fix rendering of affinity slider | Mario Vavti | 2015-06-11 | 2 | -2/+4 |
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-10 | 4 | -11/+18 |
|\| | |
|
| * | | assign right aside the same width as we have in left aside but hide it on sma... | Mario Vavti | 2015-06-10 | 4 | -11/+18 |
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 2 | -0/+2 |
|\| | |
|
| * | | put mirror_frontpage setting into admin/site | redmatrix | 2015-06-09 | 1 | -0/+1 |
| * | | toggle diaspora protocol on a per-channel level in addition to the existing p... | redmatrix | 2015-06-09 | 1 | -0/+1 |
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 3 | -2/+15 |
|\| | |
|
| * | | css regression fixes | Mario Vavti | 2015-06-08 | 1 | -0/+12 |
| * | | Merge branch 'frontpage' | redmatrix | 2015-06-07 | 2 | -2/+3 |
| |\ \ |
|
| | * | | more frontpage tweaks | redmatrix | 2015-06-07 | 1 | -1/+1 |
| | * | | reverse logic of homepage login setting | redmatrix | 2015-06-07 | 1 | -1/+1 |
| | * | | frontpage tweaks | redmatrix | 2015-06-07 | 1 | -0/+1 |
| | * | | frontpage changes | redmatrix | 2015-06-07 | 1 | -1/+1 |