aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* silence warning about non array diaspora_meta but report it in the logs so we...redmatrix2015-07-191-1/+3
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-196-52/+50
|\
| * string updateredmatrix2015-07-192-986/+926
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-164-355/+406
| |\
| | * fix missing div and a regression introduced in ec23a94b6d7f6db1e1d34275b8143c...Mario Vavti2015-07-162-50/+37
| | * Merge pull request #376 from tuscanhobbit/masterPaolo T2015-07-162-305/+369
| | |\
| | | * Updated Italian stringsPaolo Tacconi2015-07-162-305/+369
| * | | provide a way to export a single year of items (to potentially keep from exha...redmatrix2015-07-163-3/+40
| |/ /
| * | allow plugins to provide module handlers for arbitrary modules that haven't b...redmatrix2015-07-152-0/+13
* | | typoredmatrix2015-07-191-1/+1
* | | the view_photos and post_photos permissions are redundant and are now mapped ...redmatrix2015-07-1910-74/+36
* | | some photo/attach permissions issuesredmatrix2015-07-181-12/+22
* | | Merge branch 'master' of https://github.com/redmatrix/hubzillaredmatrix2015-07-181-2/+2
|\ \ \
| * \ \ Merge pull request #20 from git-marijus/masterredmatrix2015-07-191-2/+2
| |\ \ \
| | * | | make likes/dislikes work againMario Vavti2015-07-171-2/+2
| |/ / /
* / / / provide any single year of exported itemsredmatrix2015-07-163-5/+47
|/ / /
* | | abook clone sync - change logic to also unset existing cross-project flags be...redmatrix2015-07-161-16/+8
* | | don't including rating stuff from cloned abooksredmatrix2015-07-161-1/+1
* | | Merge pull request #18 from zzottel/masterredmatrix2015-07-161-1/+1
|\ \ \
| * | | fix observer tags for now (issue #17)zottel2015-07-161-1/+1
|/ / /
* | | since we've got a fresh start without a lot of legacy sites to support, provi...redmatrix2015-07-151-1/+2
* | | make tagadelic results (including categories in wall-to-wall posts) visible t...redmatrix2015-07-153-11/+17
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-152-4/+10
|\| |
| * | fix for empty recip array resulting from a mangled xchanredmatrix2015-07-151-5/+8
* | | more clone sync issues across projectsredmatrix2015-07-151-5/+5
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-152-3/+8
|\| |
| * | clone sync fixes across red/hzredmatrix2015-07-151-2/+7
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-159-15/+19
| |\ \
| * | | revision updateredmatrix2015-07-151-1/+1
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-159-15/+19
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #375 from zzottel/masterredmatrix2015-07-166-6/+6
| |\ \ \
| | * | | also change the update_ scriptszottel2015-07-153-3/+3
| | * | | change sh to bash in shebang to make scripts workzottel2015-07-153-3/+3
| |/ / /
| * | | provide info text for automatic permissionsMario Vavti2015-07-151-1/+1
| * | | whitespaceMario Vavti2015-07-151-4/+0
| * | | show inherited state in Connection Default PermissionsMario Vavti2015-07-153-7/+15
| |/ /
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-141-0/+1
|\| |
| * | fix import of group membersredmatrix2015-07-141-1/+1
* | | group fixes to importredmatrix2015-07-141-4/+14
* | | more stuff to resume failed importsredmatrix2015-07-141-1/+13
* | | log the import progressredmatrix2015-07-141-3/+9
* | | provide resumable imports if things go wrongredmatrix2015-07-141-285/+329
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-141-0/+6
|\| |
| * | stream_perms_xchans() set to empty quoted string when no results rather than ...redmatrix2015-07-141-0/+6
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-1413-521/+319
|\| |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-1410-518/+331
| |\ \
| | * | make strings translateableMario Vavti2015-07-142-6/+12
| | * | disable the inherited checkboxes for notselfMario Vavti2015-07-141-1/+1
| | * | fix mod_connedit.js after cleanupMario Vavti2015-07-142-1/+35
| | * | revert this until further investigationMario Vavti2015-07-141-1/+1