| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 7 | -7/+110 |
| |\ |
|
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-29 | 5 | -352/+382 |
| | |\ |
|
| | | * | 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 | 2 | -4/+3 |
| | * | | some prep work | redmatrix | 2015-06-29 | 3 | -2/+101 |
| | |/ |
|
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 15 | -28/+144 |
| |\| |
|
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-28 | 3 | -3/+9 |
| | |\ |
|
| | | * | Merge pull request #363 from solstag/postnotstatus | redmatrix | 2015-06-28 | 1 | -2/+2 |
| | | |\ |
|
| | | | * | simply 'post' is a better default term than 'status' | Alexandre Hannud Abdo | 2015-06-27 | 1 | -2/+2 |
| | | * | | 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 | 11 | -25/+128 |
| | |/ |
|
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-26 | 1 | -0/+2 |
| | |\ |
|
| | | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-25 | 4 | -2697/+2871 |
| | | |\ |
|
| | | * | | directory: only provide connect button if we are not already connected | Mario Vavti | 2015-06-24 | 1 | -0/+2 |
| | * | | | project updates | redmatrix | 2015-06-26 | 4 | -196/+216 |
| | | |/
| |/| |
|
| * | | | bring single instance file storage to dav and cloud uploaded photos | redmatrix | 2015-06-27 | 2 | -8/+28 |
| * | | | we aren't using the module_aside functions or hooks any more | redmatrix | 2015-06-25 | 1 | -32/+0 |
| * | | | undo the disabling of browser_prefetch and for the time being revert the HTML... | redmatrix | 2015-06-25 | 9 | -60/+46 |
| * | | | remove all QR-code stuff from core - now in qrator addon | redmatrix | 2015-06-25 | 427 | -10438/+0 |
| * | | | localise event calendar | redmatrix | 2015-06-25 | 4 | -55/+139 |
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-24 | 5 | -15/+109 |
| |\| | |
|
| | * | | Merge pull request #360 from zzottel/master | zzottel | 2015-06-24 | 4 | -2697/+2871 |
| | |\ \
| | |/
| |/| |
|
| | | * | update German help files | zottel | 2015-06-24 | 2 | -41/+56 |
| | | * | 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 | Mario Vavti | 2015-06-24 | 2 | -2/+2 |
| | |\ |
|
| | * | | Reflect in directory title if we watch the local or the global directory | Mario Vavti | 2015-06-24 | 1 | -2/+3 |
| * | | | more work on photos, including os_storage for the size '0' photo and numberin... | redmatrix | 2015-06-23 | 4 | -17/+69 |
| * | | | more work on mail flags | redmatrix | 2015-06-23 | 8 | -38/+26 |
| * | | | item flag fixes discovered after a few merges | redmatrix | 2015-06-23 | 9 | -33/+12 |
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-23 | 15 | -167/+180 |
| |\ \ \
| | |/
| |/| |
|
| | * | | typo | redmatrix | 2015-06-23 | 2 | -2/+2 |
| | |/ |
|
| | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-23 | 4 | -7/+33 |
| | |\ |
|
| | | * | Merge pull request #356 from solstag/signature_edit_fix | redmatrix | 2015-06-23 | 1 | -2/+2 |
| | | |\ |
|
| | | | * | properly trims edited posts before signing so signature verification works | Alexandre Hannud Abdo | 2015-06-23 | 1 | -2/+2 |
| | | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-22 | 5 | -29/+29 |
| | | |\| |
|
| | | * | | ensure we always sign a trimmed item body. | redmatrix | 2015-06-22 | 2 | -4/+4 |
| | | * | | discovered a couple of loose ends in the per-member enable diaspora setting | redmatrix | 2015-06-22 | 2 | -1/+27 |
| | * | | | some work on directory | Mario Vavti | 2015-06-23 | 6 | -130/+115 |
| | | |/
| |/| |
|
| | * | | Bring /help in line with the rest of the app | Mario Vavti | 2015-06-22 | 5 | -29/+29 |
| | |/ |
|
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-21 | 29 | -331/+539 |
| |\| |
|
| | * | import: Improve the descriptive text for this feature | redmatrix | 2015-06-21 | 1 | -2/+2 |
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-21 | 3 | -7/+6 |
| | |\ |
|
| | | * | Merge pull request #355 from dawnbreak/master | redmatrix | 2015-06-22 | 3 | -9/+23 |
| | | |\ |
|
| | | | * | Compatible update for .htaccess. | Klaus Weidenbach | 2015-06-22 | 3 | -9/+23 |
| | | * | | Merge pull request #354 from redmatrix/revert-353-master | Klaus | 2015-06-22 | 3 | -23/+8 |
| | | |\ \ |
|
| | | | * | | Revert "Compatible update for .htaccess." | Klaus | 2015-06-22 | 3 | -23/+8 |
| | | |/ / |
|
| | * / / | some diaspora import issues uncovered during dry-run tests | redmatrix | 2015-06-21 | 4 | -13/+14 |
| | |/ / |
|
| | * | | Merge pull request #353 from dawnbreak/master | redmatrix | 2015-06-22 | 3 | -8/+23 |
| | |\ \
| | |/
| |/| |
|
