aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-283-3/+9
|\
| * Merge pull request #363 from solstag/postnotstatusredmatrix2015-06-281-2/+2
| |\ | | | | | | simply 'post' is a better default term than 'status'
| | * simply 'post' is a better default term than 'status'Alexandre Hannud Abdo2015-06-271-2/+2
| | |
| * | 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-2811-25/+128
|/ | | | still pretty cool.
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-261-0/+2
|\
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-06-254-2697/+2871
| |\
| * | directory: only provide connect button if we are not already connectedMario Vavti2015-06-241-0/+2
| | |
* | | project updatesredmatrix2015-06-264-196/+216
| |/ |/|
* | Merge pull request #360 from zzottel/masterzzottel2015-06-244-2697/+2871
|\ \ | |/ |/| update German strings and help files
| * update German help fileszottel2015-06-242-41/+56
| |
| * 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
| | | | content by adding a slight shadow and centering the main content on the screen. Also the default width of the content is set to 640px.
* Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-06-242-2/+2
|\
| * typoredmatrix2015-06-232-2/+2
| |
* | Reflect in directory title if we watch the local or the global directoryMario Vavti2015-06-241-2/+3
|/
* 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 …
| | * 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
|/
* 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 v2.
| | * Compatible update for .htaccess.Klaus Weidenbach2015-06-223-9/+23
| | | | | | | | | | | | This should hopefully work in Apache 2.2 and 2.4.
| * | Merge pull request #354 from redmatrix/revert-353-masterKlaus2015-06-223-23/+8
| |\ \ | | | | | | | | Revert "Compatible update for .htaccess."
| | * | 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.
| * Compatible update for .htaccess.Klaus Weidenbach2015-06-213-8/+23
|/ | | | This should hopefully work in Apache 2.2 and 2.4.
* do not show default in scheme selection dropdown. default.php and ↵Mario Vavti2015-06-215-3/+8
| | | | default.css should be symlinks. adjust doco accordingly.
* Merge pull request #352 from solstag/store_update_fixredmatrix2015-06-211-9/+10
|\ | | | | Make item_store_update only affect the data we requested
| * 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 ↵redmatrix2015-06-202-21/+43
| | | | | | | | duplicate reddress detection/correction
* | 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 ↵redmatrix2015-06-194-110/+221
|/ | | | json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later.
* set return url from apps pageredmatrix2015-06-182-1/+3
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-189-7163/+7428
|\
| * Merge pull request #349 from git-marijus/masterredmatrix2015-06-172-3/+15
| |\ | | | | | | make photo upload work for remote channels with perms