| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| |\ \
| | |/
| |/| |
|
| | * | Compatible update for .htaccess. | Klaus Weidenbach | 2015-06-21 | 3 | -8/+23 |
| |/ |
|
| * | do not show default in scheme selection dropdown. default.php and default.css... | Mario Vavti | 2015-06-21 | 5 | -3/+8 |
| * | Merge pull request #352 from solstag/store_update_fix | redmatrix | 2015-06-21 | 1 | -9/+10 |
| |\ |
|
| | * | Make item_store_update only affect the data we requested | Alexandre Hannud Abdo | 2015-06-20 | 1 | -9/+10 |
| * | | ensure the photo driver is included | redmatrix | 2015-06-20 | 1 | -0/+1 |
| * | | import_diaspora - incorrect method for importing channel photo, and add dupli... | redmatrix | 2015-06-20 | 2 | -21/+43 |
| * | | wrong logic | redmatrix | 2015-06-19 | 1 | -1/+1 |
| * | | import_diaspora - a few more atypical settings | redmatrix | 2015-06-19 | 1 | -3/+19 |
| * | | automatically gunzip Diaspora export files if we're on a *nix system | redmatrix | 2015-06-19 | 1 | -0/+9 |
| * | | import_diaspora: add all the friends | redmatrix | 2015-06-19 | 1 | -4/+13 |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-19 | 16 | -308/+330 |
| |\ \ |
|
| | * | | 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 | 12 | -273/+282 |
| | |/ |
|
| * / | very early attempt diaspora import from diaspora export file. Currently the j... | redmatrix | 2015-06-19 | 4 | -110/+221 |
| |/ |
|
* | | all file attachments are now stored natively, still have photos-0 to store na... | redmatrix | 2015-06-18 | 1 | -11/+68 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-18 | 5 | -6/+16 |
|\| |
|
| * | set return url from apps page | redmatrix | 2015-06-18 | 2 | -1/+3 |
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-18 | 9 | -7163/+7428 |
| |\ |
|
| * | | issues with markdownify and escaped HTML | redmatrix | 2015-06-18 | 3 | -5/+13 |
* | | | more photos work | redmatrix | 2015-06-17 | 4 | -6/+15 |
* | | | lots of work on merging photo and file albums/folders | redmatrix | 2015-06-17 | 5 | -25/+57 |
* | | | attach_mkdirp - implement force option to return success if dir exists | redmatrix | 2015-06-17 | 1 | -2/+9 |
* | | | recursive mkdir (ala mkdir -p) for file and photo storage | redmatrix | 2015-06-16 | 1 | -1/+90 |
* | | | start work on photo directories | redmatrix | 2015-06-16 | 1 | -2/+30 |
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-16 | 3 | -3/+26 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge pull request #349 from git-marijus/master | redmatrix | 2015-06-17 | 2 | -3/+15 |
| |\ \ |
|
| | * | | fix deleting of album for remote channel | Mario Vavti | 2015-06-16 | 1 | -2/+2 |
| | * | | make photo upload work for remote channels with perms | Mario Vavti | 2015-06-16 | 1 | -1/+13 |
| * | | | Small fix in siteinfo | jeroenpraat | 2015-06-16 | 1 | -1/+1 |
| |/ / |
|