aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into permsredmatrix2016-07-132-26/+60
|\
| * document mod_acl a bit better and try to remove some redundancies and consoli...redmatrix2016-07-131-25/+59
| * missing namespace prefix \redmatrix2016-07-121-1/+1
* | more work on permsredmatrix2016-07-123-18/+10
* | Merge branch 'dev' into permsredmatrix2016-07-1210-22/+180
|\|
| * move permissiondescription class to zotlabs/libredmatrix2016-07-1110-22/+180
* | Merge branch 'dev' into permsredmatrix2016-07-118-38/+20
|\|
| * force non-null sess_dataredmatrix2016-07-111-1/+2
| * use the profile_uid here.redmatrix2016-07-111-7/+2
| * remove check for mcryptMario Vavti2016-07-101-5/+0
| * gak one more typoredmatrix2016-07-071-1/+1
| * typoredmatrix2016-07-071-1/+1
| * duplicate supression SQL query was horribly inefficient and could cause issue...redmatrix2016-07-071-11/+13
| * Merge pull request #450 from git-marijus/devhubzilla2016-07-083-14/+2
| |\
| | * more fixes for /cloud and /davMario Vavti2016-07-073-13/+2
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-064-7/+285
| | |\
| | * | fix /cloud after recent changesMario Vavti2016-07-061-2/+1
| * | | hide the redeliver option one level down since it should rarely be needed by ...redmatrix2016-07-071-0/+1
| * | | expire crashing on shared hosting from memory exhaustion. Lower the expire li...redmatrix2016-07-061-1/+1
| | |/ | |/|
* | | more perms work - notably the stuff in public_permsredmatrix2016-07-111-7/+13
* | | more permissions workredmatrix2016-07-093-19/+35
* | | more work on permsredmatrix2016-07-092-2/+5
* | | revise how we store perm_limitsredmatrix2016-07-071-31/+8
* | | more work on permissionsredmatrix2016-07-052-51/+64
* | | Merge branch 'dev' into permsredmatrix2016-07-052-5/+281
|\| |
| * | merge include/reddav.php into Zotlabs/Storage/Directory.phpredmatrix2016-07-051-4/+280
| * | regression - save bookmarks no longer present in item menuredmatrix2016-07-051-1/+1
* | | 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
| | | |\