| Commit message (Expand) | Author | Age | Files | Lines |
* | silence warning about non array diaspora_meta but report it in the logs so we... | redmatrix | 2015-07-19 | 1 | -1/+3 |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-19 | 6 | -52/+50 |
|\ |
|
| * | string update | redmatrix | 2015-07-19 | 2 | -986/+926 |
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-16 | 4 | -355/+406 |
| |\ |
|
| | * | fix missing div and a regression introduced in ec23a94b6d7f6db1e1d34275b8143c... | Mario Vavti | 2015-07-16 | 2 | -50/+37 |
| | * | Merge pull request #376 from tuscanhobbit/master | Paolo T | 2015-07-16 | 2 | -305/+369 |
| | |\ |
|
| | | * | Updated Italian strings | Paolo Tacconi | 2015-07-16 | 2 | -305/+369 |
| * | | | provide a way to export a single year of items (to potentially keep from exha... | redmatrix | 2015-07-16 | 3 | -3/+40 |
| |/ / |
|
| * | | allow plugins to provide module handlers for arbitrary modules that haven't b... | redmatrix | 2015-07-15 | 2 | -0/+13 |
* | | | typo | redmatrix | 2015-07-19 | 1 | -1/+1 |
* | | | the view_photos and post_photos permissions are redundant and are now mapped ... | redmatrix | 2015-07-19 | 10 | -74/+36 |
* | | | some photo/attach permissions issues | redmatrix | 2015-07-18 | 1 | -12/+22 |
* | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | redmatrix | 2015-07-18 | 1 | -2/+2 |
|\ \ \ |
|
| * \ \ | Merge pull request #20 from git-marijus/master | redmatrix | 2015-07-19 | 1 | -2/+2 |
| |\ \ \ |
|
| | * | | | make likes/dislikes work again | Mario Vavti | 2015-07-17 | 1 | -2/+2 |
| |/ / / |
|
* / / / | provide any single year of exported items | redmatrix | 2015-07-16 | 3 | -5/+47 |
|/ / / |
|
* | | | abook clone sync - change logic to also unset existing cross-project flags be... | redmatrix | 2015-07-16 | 1 | -16/+8 |
* | | | don't including rating stuff from cloned abooks | redmatrix | 2015-07-16 | 1 | -1/+1 |
* | | | Merge pull request #18 from zzottel/master | redmatrix | 2015-07-16 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | fix observer tags for now (issue #17) | zottel | 2015-07-16 | 1 | -1/+1 |
|/ / / |
|
* | | | since we've got a fresh start without a lot of legacy sites to support, provi... | redmatrix | 2015-07-15 | 1 | -1/+2 |
* | | | make tagadelic results (including categories in wall-to-wall posts) visible t... | redmatrix | 2015-07-15 | 3 | -11/+17 |
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 2 | -4/+10 |
|\| | |
|
| * | | fix for empty recip array resulting from a mangled xchan | redmatrix | 2015-07-15 | 1 | -5/+8 |
* | | | more clone sync issues across projects | redmatrix | 2015-07-15 | 1 | -5/+5 |
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 2 | -3/+8 |
|\| | |
|
| * | | clone sync fixes across red/hz | redmatrix | 2015-07-15 | 1 | -2/+7 |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-15 | 9 | -15/+19 |
| |\ \ |
|
| * | | | revision update | redmatrix | 2015-07-15 | 1 | -1/+1 |
* | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 9 | -15/+19 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge pull request #375 from zzottel/master | redmatrix | 2015-07-16 | 6 | -6/+6 |
| |\ \ \ |
|
| | * | | | also change the update_ scripts | zottel | 2015-07-15 | 3 | -3/+3 |
| | * | | | change sh to bash in shebang to make scripts work | zottel | 2015-07-15 | 3 | -3/+3 |
| |/ / / |
|
| * | | | provide info text for automatic permissions | Mario Vavti | 2015-07-15 | 1 | -1/+1 |
| * | | | whitespace | Mario Vavti | 2015-07-15 | 1 | -4/+0 |
| * | | | show inherited state in Connection Default Permissions | Mario Vavti | 2015-07-15 | 3 | -7/+15 |
| |/ / |
|
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 1 | -0/+1 |
|\| | |
|
| * | | fix import of group members | redmatrix | 2015-07-14 | 1 | -1/+1 |
* | | | group fixes to import | redmatrix | 2015-07-14 | 1 | -4/+14 |
* | | | more stuff to resume failed imports | redmatrix | 2015-07-14 | 1 | -1/+13 |
* | | | log the import progress | redmatrix | 2015-07-14 | 1 | -3/+9 |
* | | | provide resumable imports if things go wrong | redmatrix | 2015-07-14 | 1 | -285/+329 |
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 1 | -0/+6 |
|\| | |
|
| * | | stream_perms_xchans() set to empty quoted string when no results rather than ... | redmatrix | 2015-07-14 | 1 | -0/+6 |
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 13 | -521/+319 |
|\| | |
|
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-14 | 10 | -518/+331 |
| |\ \ |
|
| | * | | make strings translateable | Mario Vavti | 2015-07-14 | 2 | -6/+12 |
| | * | | disable the inherited checkboxes for notself | Mario Vavti | 2015-07-14 | 1 | -1/+1 |
| | * | | fix mod_connedit.js after cleanup | Mario Vavti | 2015-07-14 | 2 | -1/+35 |
| | * | | revert this until further investigation | Mario Vavti | 2015-07-14 | 1 | -1/+1 |