Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | schema focus: adjust width to match photo width in /photos | Mario Vavti | 2015-07-07 | 1 | -1/+1 | |
| | | ||||||
* | | various css fixes | Mario Vavti | 2015-07-07 | 7 | -15/+8 | |
| | | ||||||
* | | more word wrap fixes | Mario Vavti | 2015-07-07 | 1 | -0/+2 | |
| | | ||||||
* | | move if clause outside of the div | Mario Vavti | 2015-07-07 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-07-07 | 1 | -1/+1 | |
|\| | ||||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-06 | 1 | -0/+4 | |
| |\ | ||||||
| * | | version update | redmatrix | 2015-07-06 | 1 | -1/+1 | |
| | | | ||||||
* | | | use default style for default webpage | Mario Vavti | 2015-07-07 | 1 | -7/+12 | |
| |/ |/| | ||||||
* | | fix word wrapping in tagblock and dirtagblock and possibly other places | Mario Vavti | 2015-07-06 | 1 | -0/+4 | |
|/ | ||||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-05 | 1 | -1/+1 | |
|\ | ||||||
| * | schema focus: adjust default width | Mario Vavti | 2015-07-05 | 1 | -1/+1 | |
| | | ||||||
* | | version update | redmatrix | 2015-07-05 | 1 | -1/+1 | |
|/ | ||||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-03 | 3 | -7066/+7315 | |
|\ | ||||||
| * | Merge pull request #370 from tuscanhobbit/master | redmatrix | 2015-07-03 | 2 | -7065/+7315 | |
| |\ | | | | | | | Updated Italian localization | |||||
| | * | Updated Italian localization | Paolo Tacconi | 2015-07-03 | 2 | -7065/+7315 | |
| |/ | ||||||
| * | Merge pull request #369 from zzottel/master | zzottel | 2015-07-03 | 1 | -1/+0 | |
| |\ | | | | | | | update German main help file | |||||
| | * | update German main help file | zottel | 2015-07-03 | 1 | -1/+0 | |
| |/ | ||||||
* / | in hubzilla we're going to convert doco to items. define it here so that an ↵ | redmatrix | 2015-07-03 | 4 | -252/+307 | |
|/ | | | | accidental import/export doesn't chuck a wobbly. | |||||
* | a few clone sync fixes as well as some work on hubzilla clone sync back to ↵ | redmatrix | 2015-07-02 | 5 | -0/+52 | |
| | | | | redmatrix | |||||
* | a bit of cleanup and explanatory text on mod/pconfig | redmatrix | 2015-07-02 | 1 | -6/+13 | |
| | ||||||
* | web version of util/pconfig | redmatrix | 2015-07-02 | 2 | -1/+106 | |
| | ||||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-01 | 10 | -609/+991 | |
|\ | ||||||
| * | Merge pull request #365 from adsfkajlsfdas/master | git-marijus | 2015-07-01 | 4 | -35/+1 | |
| |\ | | | | | | | Clean up | |||||
| | * | Clean up | Thomas Willingham | 2015-06-30 | 4 | -35/+1 | |
| | | | ||||||
| * | | since we can now use plain upstream justifiedGallery library - switch to ↵ | Mario Vavti | 2015-07-01 | 3 | -2/+16 | |
| | | | | | | | | | | | | minified version | |||||
| * | | update justifiedGallery to versio 3.6.0 | Mario Vavti | 2015-07-01 | 3 | -572/+974 | |
| |/ | ||||||
* / | provide backward compatibility with hubzilla extended item export | redmatrix | 2015-07-01 | 2 | -1/+56 | |
|/ | ||||||
* | warn if export data file is from an incompatible project or if the DB ↵ | redmatrix | 2015-06-29 | 1 | -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. | redmatrix | 2015-06-29 | 4 | -0/+12 | |
| | ||||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-29 | 5 | -352/+382 | |
|\ | ||||||
| * | Update NL + 1 revert css, see comment here: ↵ | jeroenpraat | 2015-06-30 | 3 | -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 ↵ | jeroenpraat | 2015-06-29 | 1 | -0/+5 | |
| | | | | | | | | long channel names in the admin area. If there's a better alternative, be my guest. | |||||
| * | fix directory location | Mario Vavti | 2015-06-29 | 2 | -4/+3 | |
| | | ||||||
* | | some prep work | redmatrix | 2015-06-29 | 3 | -2/+101 | |
|/ | ||||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-28 | 3 | -3/+9 | |
|\ | ||||||
| * | Merge pull request #363 from solstag/postnotstatus | redmatrix | 2015-06-28 | 1 | -2/+2 | |
| |\ | | | | | | | simply 'post' is a better default term than 'status' | |||||
| | * | simply 'post' is a better default term than 'status' | Alexandre Hannud Abdo | 2015-06-27 | 1 | -2/+2 | |
| | | | ||||||
| * | | css fixes | Mario Vavti | 2015-06-27 | 2 | -1/+7 | |
| |/ | ||||||
* / | no this isn't it. well ok, it's part of it, but not the important part. it's ↵ | redmatrix | 2015-06-28 | 11 | -25/+128 | |
|/ | | | | still pretty cool. | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-26 | 1 | -0/+2 | |
|\ | ||||||
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-25 | 4 | -2697/+2871 | |
| |\ | ||||||
| * | | directory: only provide connect button if we are not already connected | Mario Vavti | 2015-06-24 | 1 | -0/+2 | |
| | | | ||||||
* | | | project updates | redmatrix | 2015-06-26 | 4 | -196/+216 | |
| |/ |/| | ||||||
* | | Merge pull request #360 from zzottel/master | zzottel | 2015-06-24 | 4 | -2697/+2871 | |
|\ \ | |/ |/| | update German strings and help files | |||||
| * | update German help files | zottel | 2015-06-24 | 2 | -41/+56 | |
| | | ||||||
| * | update to German strings | zottel | 2015-06-24 | 2 | -2656/+2815 | |
|/ | ||||||
* | Add a new redbasic scheme called focus - It is supposed to focus on the main ↵ | Mario Vavti | 2015-06-24 | 2 | -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/redmatrix | Mario Vavti | 2015-06-24 | 2 | -2/+2 | |
|\ | ||||||
| * | typo | redmatrix | 2015-06-23 | 2 | -2/+2 | |
| | | ||||||
* | | Reflect in directory title if we watch the local or the global directory | Mario Vavti | 2015-06-24 | 1 | -2/+3 | |
|/ |