aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-051-1/+1
|\
| * schema focus: adjust default widthMario Vavti2015-07-051-1/+1
* | version updateredmatrix2015-07-051-1/+1
|/
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-033-7066/+7315
|\
| * Merge pull request #370 from tuscanhobbit/masterredmatrix2015-07-032-7065/+7315
| |\
| | * Updated Italian localizationPaolo Tacconi2015-07-032-7065/+7315
| |/
| * Merge pull request #369 from zzottel/masterzzottel2015-07-031-1/+0
| |\
| | * update German main help filezottel2015-07-031-1/+0
| |/
* / in hubzilla we're going to convert doco to items. define it here so that an a...redmatrix2015-07-034-252/+307
|/
* a few clone sync fixes as well as some work on hubzilla clone sync back to re...redmatrix2015-07-025-0/+52
* a bit of cleanup and explanatory text on mod/pconfigredmatrix2015-07-021-6/+13
* 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 upThomas Willingham2015-06-304-35/+1
| * | since we can now use plain upstream justifiedGallery library - switch to mini...Mario Vavti2015-07-013-2/+16
| * | 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 version...redmatrix2015-06-291-0/+14
* 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: 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