aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-295-352/+382
|\
| * Update NL + 1 revert css, see comment here: https://github.com/redmatrix/redm...jeroenpraat2015-06-303-348/+374
| * Probably a ugly hack, but it's the only way I could found that cuts off very ...jeroenpraat2015-06-291-0/+5
| * fix directory locationMario Vavti2015-06-292-4/+3
* | some prep workredmatrix2015-06-293-2/+101
|/
* 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'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
|/
* 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 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
* 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 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.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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 10:18:19 +0000