aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* web version of util/pconfigredmatrix2015-07-022-1/+106
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-0110-609/+991
|\
| * Merge pull request #365 from adsfkajlsfdas/mastergit-marijus2015-07-014-35/+1
| |\ | | | | | | Clean up
| | * Clean upThomas Willingham2015-06-304-35/+1
| | |
| * | since we can now use plain upstream justifiedGallery library - switch to ↵Mario Vavti2015-07-013-2/+16
| | | | | | | | | | | | minified version
| * | update justifiedGallery to versio 3.6.0Mario Vavti2015-07-013-572/+974
| |/
* / provide backward compatibility with hubzilla extended item exportredmatrix2015-07-012-1/+56
|/
* warn if export data file is from an incompatible project or if the DB ↵redmatrix2015-06-291-0/+14
| | | | version differs significantly from the current DB. This is to avoid people cloning a hubzilla channel back to red and potentially stuffing up the works. Hopefully we can migrate upwards someday. Downwards is always going to be an issue.
* turn the connection filter into a feature.redmatrix2015-06-294-0/+12
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-295-352/+382
|\
| * Update NL + 1 revert css, see comment here: ↵jeroenpraat2015-06-303-348/+374
| | | | | | | | https://github.com/redmatrix/redmatrix/commit/22b9e97ae2e46513c7a43cb27e7230bc5c40b9d4
| * Probably a ugly hack, but it's the only way I could found that cuts off very ↵jeroenpraat2015-06-291-0/+5
| | | | | | | | long channel names in the admin area. If there's a better alternative, be my guest.
| * 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'
| | * 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
| |