aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* more work on mail flagsredmatrix2015-06-238-38/+26
* item flag fixes discovered after a few mergesredmatrix2015-06-239-33/+12
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-2315-167/+180
|\
| * typoredmatrix2015-06-232-2/+2
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-06-234-7/+33
| |\
| | * Merge pull request #356 from solstag/signature_edit_fixredmatrix2015-06-231-2/+2
| | |\
| | | * properly trims edited posts before signing so signature verification worksAlexandre Hannud Abdo2015-06-231-2/+2
| | * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-225-29/+29
| | |\|
| | * | ensure we always sign a trimmed item body.redmatrix2015-06-222-4/+4
| | * | discovered a couple of loose ends in the per-member enable diaspora settingredmatrix2015-06-222-1/+27
| * | | some work on directoryMario Vavti2015-06-236-130/+115
| | |/ | |/|
| * | Bring /help in line with the rest of the appMario Vavti2015-06-225-29/+29
| |/
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-2129-331/+539
|\|
| * import: Improve the descriptive text for this featureredmatrix2015-06-211-2/+2
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-213-7/+6
| |\
| | * Merge pull request #355 from dawnbreak/masterredmatrix2015-06-223-9/+23
| | |\
| | | * Compatible update for .htaccess.Klaus Weidenbach2015-06-223-9/+23
| | * | Merge pull request #354 from redmatrix/revert-353-masterKlaus2015-06-223-23/+8
| | |\ \
| | | * | Revert "Compatible update for .htaccess."Klaus2015-06-223-23/+8
| | |/ /
| * / / some diaspora import issues uncovered during dry-run testsredmatrix2015-06-214-13/+14
| |/ /
| * | Merge pull request #353 from dawnbreak/masterredmatrix2015-06-223-8/+23
| |\ \ | | |/ | |/|
| | * Compatible update for .htaccess.Klaus Weidenbach2015-06-213-8/+23
| |/
| * do not show default in scheme selection dropdown. default.php and default.css...Mario Vavti2015-06-215-3/+8
| * Merge pull request #352 from solstag/store_update_fixredmatrix2015-06-211-9/+10
| |\
| | * Make item_store_update only affect the data we requestedAlexandre Hannud Abdo2015-06-201-9/+10
| * | ensure the photo driver is includedredmatrix2015-06-201-0/+1
| * | import_diaspora - incorrect method for importing channel photo, and add dupli...redmatrix2015-06-202-21/+43
| * | wrong logicredmatrix2015-06-191-1/+1
| * | import_diaspora - a few more atypical settingsredmatrix2015-06-191-3/+19
| * | automatically gunzip Diaspora export files if we're on a *nix systemredmatrix2015-06-191-0/+9
| * | import_diaspora: add all the friendsredmatrix2015-06-191-4/+13
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-1916-308/+330
| |\ \
| | * | 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-1912-273/+282
| | |/
| * / very early attempt diaspora import from diaspora export file. Currently the j...redmatrix2015-06-194-110/+221
| |/
* | all file attachments are now stored natively, still have photos-0 to store na...redmatrix2015-06-181-11/+68
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-185-6/+16
|\|
| * set return url from apps pageredmatrix2015-06-182-1/+3
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-189-7163/+7428
| |\
| * | issues with markdownify and escaped HTMLredmatrix2015-06-183-5/+13
* | | more photos workredmatrix2015-06-174-6/+15
* | | lots of work on merging photo and file albums/foldersredmatrix2015-06-175-25/+57
* | | attach_mkdirp - implement force option to return success if dir existsredmatrix2015-06-171-2/+9
* | | recursive mkdir (ala mkdir -p) for file and photo storageredmatrix2015-06-161-1/+90
* | | start work on photo directoriesredmatrix2015-06-161-2/+30
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-163-3/+26
|\ \ \ | | |/ | |/|
| * | Merge pull request #349 from git-marijus/masterredmatrix2015-06-172-3/+15
| |\ \
| | * | fix deleting of album for remote channelMario Vavti2015-06-161-2/+2
| | * | make photo upload work for remote channels with permsMario Vavti2015-06-161-1/+13