aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * revert provide inherited perms for connection default permissionsMario Vavti2015-07-141-1/+1
| | * remove dbgMario Vavti2015-07-141-2/+0
| | * provide inherited perms for connection default permissionsMario Vavti2015-07-141-1/+3
| | * css fixesMario Vavti2015-07-141-5/+1
| | * cleanup conneditMario Vavti2015-07-149-550/+309
| * | coverup and ignore the illegal string offset message that some sites have bee...redmatrix2015-07-143-3/+5
* | | Merge branch 'master' of https://github.com/redmatrix/hubzillaredmatrix2015-07-131-1/+0
|\ \ \
| * \ \ Merge pull request #14 from git-marijus/masterredmatrix2015-07-124-17/+23
| |\ \ \
| | * \ \ Merge remote-tracking branch 'redmatrix/master'Mario Vavti2015-07-111-6/+6
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'redmatrix/master'Mario Vavti2015-07-112-10/+14
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'redmatrix/master'Mario Vavti2015-07-111-0/+3
| | |\ \ \ \ \
| | * \ \ \ \ \ mergeMario Vavti2015-07-112-2/+5
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | merge redmatrix fixesMario Vavti2015-07-1021-134/+159
| | |\ \ \ \ \ \
* | | | | | | | | merge from redmatrixredmatrix2015-07-131-1/+1
* | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-136-11/+30
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge pull request #373 from zzottel/masterredmatrix2015-07-141-0/+18
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | change account_default_channel if default channel is removedzottel2015-07-131-0/+18
| |/ / / / / / /
| * | | | | | | Only let local logins install webpage elementsredmatrix2015-07-111-1/+5
| * | | | | | | allow sys editing of menuredmatrix2015-07-111-0/+1
| * | | | | | | whitespace and comment out info againMario Vavti2015-07-122-3/+3
| * | | | | | | fix sys channel menu in a morre standard wayMario Vavti2015-07-123-5/+5