| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-03 | 4 | -100/+618 |
|\ |
|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-03 | 3 | -7066/+7315 |
| |\ |
|
| * | | in hubzilla we're going to convert doco to items. define it here so that an a... | redmatrix | 2015-07-03 | 4 | -252/+307 |
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-03 | 1 | -1/+0 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge pull request #370 from tuscanhobbit/master | redmatrix | 2015-07-03 | 2 | -7065/+7315 |
| |\ \ |
|
| | * | | 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 | zottel | 2015-07-03 | 1 | -1/+0 |
| |/ |
|
* | | start doco cleanup | redmatrix | 2015-07-03 | 65 | -62/+67 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-02 | 6 | -2/+143 |
|\| |
|
| * | a few clone sync fixes as well as some work on hubzilla clone sync back to re... | redmatrix | 2015-07-02 | 5 | -0/+52 |
| * | 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 |
* | | sync abook entries from redmatrix | redmatrix | 2015-07-02 | 12 | -610/+1013 |
|\| |
|
| * | 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 | Thomas Willingham | 2015-06-30 | 4 | -35/+1 |
| | * | | since we can now use plain upstream justifiedGallery library - switch to mini... | Mario Vavti | 2015-07-01 | 3 | -2/+16 |
| | * | | 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 |
| |/ |
|
* | | provide compatibility with redmatrix extended item export | redmatrix | 2015-07-01 | 1 | -3/+50 |
* | | turn attached audio/video into audio/video elements as well as providing an a... | redmatrix | 2015-07-01 | 2 | -3/+8 |
* | | cleanup of import to allow cross-product import going one way. Note - items/c... | redmatrix | 2015-06-30 | 1 | -9/+4 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-30 | 1 | -0/+14 |
|\| |
|
| * | warn if export data file is from an incompatible project or if the DB version... | redmatrix | 2015-06-29 | 1 | -0/+14 |
* | | lots of work on clone/import from redmatrix to hubzilla (won't go back the ot... | redmatrix | 2015-06-30 | 2 | -18/+63 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 4 | -0/+12 |
|\| |
|
| * | turn the connection filter into a feature. | redmatrix | 2015-06-29 | 4 | -0/+12 |
* | | fix the postgres schema with all the changes to date | redmatrix | 2015-06-29 | 2 | -5/+116 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 7 | -7/+110 |
|\| |
|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-29 | 5 | -352/+382 |
| |\ |
|
| | * | Update NL + 1 revert css, see comment here: https://github.com/redmatrix/redm... | jeroenpraat | 2015-06-30 | 3 | -348/+374 |
| | * | Probably a ugly hack, but it's the only way I could found that cuts off very ... | jeroenpraat | 2015-06-29 | 1 | -0/+5 |
| | * | fix directory location | Mario Vavti | 2015-06-29 | 2 | -4/+3 |
| * | | some prep work | redmatrix | 2015-06-29 | 3 | -2/+101 |
| |/ |
|
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 15 | -28/+144 |
|\| |
|
| * | 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' | 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 |
| |/ |
|
| * | 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 |
| | |/
| |/| |
|
* | | | bring single instance file storage to dav and cloud uploaded photos | redmatrix | 2015-06-27 | 2 | -8/+28 |
* | | | we aren't using the module_aside functions or hooks any more | redmatrix | 2015-06-25 | 1 | -32/+0 |
* | | | undo the disabling of browser_prefetch and for the time being revert the HTML... | redmatrix | 2015-06-25 | 9 | -60/+46 |
* | | | remove all QR-code stuff from core - now in qrator addon | redmatrix | 2015-06-25 | 427 | -10438/+0 |
* | | | localise event calendar | redmatrix | 2015-06-25 | 4 | -55/+139 |