Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |
| | * | | revert provide inherited perms for connection default permissions | Mario Vavti | 2015-07-14 | 1 | -1/+1 | |
| | * | | remove dbg | Mario Vavti | 2015-07-14 | 1 | -2/+0 | |
| | * | | provide inherited perms for connection default permissions | Mario Vavti | 2015-07-14 | 1 | -1/+3 | |
| | * | | css fixes | Mario Vavti | 2015-07-14 | 1 | -5/+1 | |
| | * | | cleanup connedit | Mario Vavti | 2015-07-14 | 9 | -550/+309 | |
| * | | | coverup and ignore the illegal string offset message that some sites have bee... | redmatrix | 2015-07-14 | 3 | -3/+5 | |
* | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | redmatrix | 2015-07-13 | 1 | -1/+0 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #14 from git-marijus/master | redmatrix | 2015-07-12 | 4 | -17/+23 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge remote-tracking branch 'redmatrix/master' | Mario Vavti | 2015-07-11 | 1 | -6/+6 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge remote-tracking branch 'redmatrix/master' | Mario Vavti | 2015-07-11 | 2 | -10/+14 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'redmatrix/master' | Mario Vavti | 2015-07-11 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | merge | Mario Vavti | 2015-07-11 | 2 | -2/+5 | |
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | merge redmatrix fixes | Mario Vavti | 2015-07-10 | 21 | -134/+159 | |
| | |\ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | merge from redmatrix | redmatrix | 2015-07-13 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-13 | 6 | -11/+30 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #373 from zzottel/master | redmatrix | 2015-07-14 | 1 | -0/+18 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
| | * | | | | | | | | change account_default_channel if default channel is removed | zottel | 2015-07-13 | 1 | -0/+18 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Only let local logins install webpage elements | redmatrix | 2015-07-11 | 1 | -1/+5 |