aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* start to refactor the permission rolesredmatrix2016-07-042-23/+175
* more heavy lifting on xtensible permsredmatrix2016-07-044-9/+12
* more heavy lifting on extensible permsredmatrix2016-07-042-3/+22
* minorredmatrix2016-07-041-1/+1
* perms work - settings pageredmatrix2016-07-031-20/+13
* make permissionlimits into a classredmatrix2016-07-031-0/+46
* Merge branch 'dev' into permsredmatrix2016-07-0321-42/+225
|\
| * force immediate avatar updateTreer2016-07-031-0/+2
| * Mark nickname as required field, if left empty then channel creation fails si...Treer2016-07-031-2/+2
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-011-2/+4
| |\
| | * ditch the change_view widget and make header fixed in fullscreen modeMario Vavti2016-07-011-2/+4
| * | delivery invoked twice in mod_tagger, once in post_activity_item() and anothe...redmatrix2016-07-011-9/+5
| * | use small photo for Diaspora attribution correction; the medium looks awkward...redmatrix2016-07-011-0/+9
| |/
| * allow multiple apd's per plugin dirredmatrix2016-07-012-2/+5
| * disable wiki if feature disabled, sync updates of delayed publish postsredmatrix2016-06-303-2/+17
| * sync flags even if post has not been editedredmatrix2016-06-301-1/+14
| * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-3037-55/+242
| |\
| | * dreport: convert timestamp to channel localtime and get rid of old pre-templa...redmatrix2016-06-291-11/+1
| | * templatise the Dreport page and add a redeliver option for when things stuff ...redmatrix2016-06-291-9/+43
| | * provide wiki as a feature (default is on so there aren't any surprises) and a...redmatrix2016-06-291-0/+15
| | * stream large photos through buffered I/O if possibleredmatrix2016-06-291-3/+27
| | * Merge pull request #444 from git-marijus/devhubzilla2016-06-301-2/+2
| | |\
| | | * Merge branch 'dev' into sabre32Mario Vavti2016-06-292-2/+5
| | | |\
| | | * \ Merge branch 'dev' into sabre32Mario Vavti2016-06-288-10/+86
| | | |\ \
| | | * \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-2727-27/+72
| | | |\ \ \
| | | * \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-261-21/+25
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-2411-73/+244
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-232-10/+19
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ erge branch 'dev' into sabre32Mario Vavti2016-06-226-7/+751
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-212-24/+46
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-201-2/+2
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-181-2/+2
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-162-4/+52
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-154-9/+149
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-1413-80/+86
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-132-15/+183
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-103-0/+455
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-104-19/+25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-086-10/+429
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-071-43/+63
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-062-1/+190
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-054-10/+22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-032-7/+103
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-0225-196/+189
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-0121-184/+66
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-05-313-5/+171
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-05-302-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | upgrade to sabre32Mario Vavti2016-05-281-2/+2
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | missing backslash leads to wsod on refresh permissionsMario Vavti2016-06-291-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | readabilityredmatrix2016-06-281-1/+4