aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* merge 1.10RC into devMario Vavti2016-07-221-2/+2
|\
| * missing $Mario Vavti2016-07-221-2/+2
| * DAV auth issueredmatrix2016-07-211-0/+1
| * issue #453 and a bug noted from the logfiles related to the schema change las...redmatrix2016-07-201-1/+3
| * undefined functionredmatrix2016-07-201-1/+1
| * Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_mergeredmatrix2016-07-202-3/+3
| |\
| * | sort out some of the authentication mess - with luck this may fix the DAV aut...redmatrix2016-07-207-110/+26
* | | DAV auth issueredmatrix2016-07-211-0/+1
* | | issue #453 and a bug noted from the logfiles related to the schema change las...redmatrix2016-07-201-1/+3
* | | undefined functionredmatrix2016-07-201-1/+1
* | | Merge branch 'dev' into permsredmatrix2016-07-207-110/+26
|\ \ \
| * | | sort out some of the authentication mess - with luck this may fix the DAV aut...redmatrix2016-07-207-110/+26
* | | | Merge branch 'dev' into permsredmatrix2016-07-202-2/+3
|\| | |
| * | | Merge branch '1.10RC' into devMario Vavti2016-07-201-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as ...Mario Vavti2016-07-201-1/+1
| * | | Merge branch '1.10RC' into devMario Vavti2016-07-201-2/+2
| |\| |
| | * | fix /mail wsod issue reported by giac hellvecioMario Vavti2016-07-201-2/+2
| | |/
* | | fix the forum detection in include/zotredmatrix2016-07-191-2/+2
* | | permission fixesredmatrix2016-07-193-18/+11
* | | fixes to permsredmatrix2016-07-191-1/+1
* | | translate more old perms callsredmatrix2016-07-192-3/+3
* | | Merge branch 'dev' into permsredmatrix2016-07-191-1/+1
|\| |
| * | doc correctionredmatrix2016-07-191-1/+1
| |/
* | more perms work (a lot more)redmatrix2016-07-183-30/+80
* | more perms workredmatrix2016-07-181-0/+9
* | Merge branch 'dev' into permsredmatrix2016-07-1711-6/+201
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-171-1/+1
| |\
| | * hide fullscreen button in embedphotos modal album viewMario Vavti2016-07-171-1/+1
| * | include attach.php at the module level since 2d4b75428a87038 wasn't backporte...redmatrix2016-07-173-1/+4
| |/
| * os_delete_prohibitredmatrix2016-07-161-0/+4
| * add service class restrictions to access_tokensredmatrix2016-07-151-0/+10
| * remove expired access tokensredmatrix2016-07-151-0/+9
| * provide examples for using access tokens in urlsredmatrix2016-07-151-2/+7
| * mod_home: if using an atoken login on the home page redirect to the channel p...redmatrix2016-07-151-0/+13
| * make lockview work with throwaway identitiesredmatrix2016-07-151-2/+33
| * more cleanup of atoken UIredmatrix2016-07-151-1/+4
| * cleanup and debug of atoken featureredmatrix2016-07-151-2/+2
| * enforce non-empty name and token/password on access tokens until better check...redmatrix2016-07-151-9/+16
| * Here's the basic UI for the Zot Access Tokens, requires some minor cleanupredmatrix2016-07-141-1/+77
| * make the xchan_hash for the access token location independentredmatrix2016-07-141-4/+6
| * add zat to aclredmatrix2016-07-141-1/+26
| * more ZAT workredmatrix2016-07-141-1/+8
* | more perms workredmatrix2016-07-132-8/+14
* | deprecate/remove json_decode_plusredmatrix2016-07-132-4/+4
* | Merge branch 'dev' into permsredmatrix2016-07-131-2/+4
|\|
| * let abconfig specify a familyredmatrix2016-07-131-2/+4
* | lots more permission workredmatrix2016-07-134-22/+43
* | 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