aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* deprecate/remove json_decode_plusredmatrix2016-07-136-33/+25
* rework perm_is_allowedredmatrix2016-07-131-4/+8
* Merge branch 'dev' into permsredmatrix2016-07-132-5/+6
|\
| * let abconfig specify a familyredmatrix2016-07-132-4/+6
* | lots more permission workredmatrix2016-07-135-24/+50
* | Merge branch 'dev' into permsredmatrix2016-07-135-29/+63
|\|
| * document mod_acl a bit better and try to remove some redundancies and consoli...redmatrix2016-07-134-28/+62
| * missing namespace prefix \redmatrix2016-07-121-1/+1
* | more work on permsredmatrix2016-07-125-36/+44
* | Merge branch 'dev' into permsredmatrix2016-07-1216-48/+26
|\|
| * update_remote_id - updated to work with iconfigredmatrix2016-07-121-18/+5
| * don't try to send sync packets to dead sites.redmatrix2016-07-121-1/+6
| * the abconfig defaults weren't changed in the schema files when they were chan...redmatrix2016-07-122-2/+2
| * move permissiondescription class to zotlabs/libredmatrix2016-07-1111-26/+12
| * use the get_hostname function rather than parse the urlredmatrix2016-07-111-1/+1
* | Merge branch 'dev' into permsredmatrix2016-07-1122-1344/+1364
|\|
| * document the new change_channel hookredmatrix2016-07-112-0/+14
| * create change_channel hookredmatrix2016-07-111-0/+4
| * force non-null sess_dataredmatrix2016-07-111-1/+2
| * use the profile_uid here.redmatrix2016-07-111-7/+2
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-118-18/+16
| |\
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-111-5/+0
| | |\
| | | * Merge pull request #451 from git-marijus/devhubzilla2016-07-111-5/+0
| | | |\
| | | | * remove check for mcryptMario Vavti2016-07-101-5/+0
| | | | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-105-1284/+1313
| | | | |\ | | | | |/ | | | |/|
| | | | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-072-19/+10
| | | | |\
| | * | | | do not use visibility for fullscreen button and move fullscreen button to the...Mario Vavti2016-07-117-13/+16
| | |/ / /
| * / / / more sql fine tuningredmatrix2016-07-091-1/+1
| |/ / /
| * | | some work on the forum widget queriesredmatrix2016-07-092-1273/+1292
| * | | 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-0610-345/+386
| | |\ \
| | * | | 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-072-1/+9
| | |_|/ | |/| |
| * | | reduce the memory usage of the expire query dramatically.redmatrix2016-07-061-19/+10
| * | | expire crashing on shared hosting from memory exhaustion. Lower the expire li...redmatrix2016-07-062-2/+2
| | |/ | |/|
* | | more perms work - notably the stuff in public_permsredmatrix2016-07-112-62/+30
* | | perms workredmatrix2016-07-101-37/+13
* | | change default so we don't have to check for array existence laterredmatrix2016-07-091-1/+1
* | | more permissions workredmatrix2016-07-095-21/+39
* | | more work on permsredmatrix2016-07-097-46/+51
* | | revise how we store perm_limitsredmatrix2016-07-075-100/+25
* | | more work on permissionsredmatrix2016-07-052-51/+64
* | | Merge branch 'dev' into permsredmatrix2016-07-056-343/+297
|\| |
| * | unused fileredmatrix2016-07-051-35/+0
| * | merge include/reddav.php into Zotlabs/Storage/Directory.phpredmatrix2016-07-052-303/+280
| * | cleanupredmatrix2016-07-051-2/+14