aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | 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
| |\ \ \ \ \
| * | | | | | lots more permission workredmatrix2016-07-134-22/+43
| * | | | | | Merge branch 'dev' into permsredmatrix2016-07-132-26/+60
| |\ \ \ \ \ \
| * | | | | | | more work on permsredmatrix2016-07-123-18/+10
| * | | | | | | Merge branch 'dev' into permsredmatrix2016-07-1210-22/+180
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' into permsredmatrix2016-07-118-38/+20
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | added permissionrolesredmatrix2016-06-272-30/+72
| * | | | | | | | | | | Merge branch 'dev' into permsredmatrix2016-06-2755-244/+2058
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | initial perms workredmatrix2016-06-091-0/+81
* | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-202-3/+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
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
* | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-204-2/+5
|\| | | | | | | | | |
| * | | | | | | | | | doc correctionredmatrix2016-07-191-1/+1
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-171-1/+1
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | include attach.php at the module level since 2d4b75428a87038 wasn't backporte...redmatrix2016-07-173-1/+4
* | | | | | | | | | | Starting to make the import selection page after element scan.Andrew Manning2016-07-201-80/+98
* | | | | | | | | | | Importing webpage elements from manually entered cloud file path work. All de...Andrew Manning2016-07-171-2/+21
* | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | hide fullscreen button in embedphotos modal album viewMario Vavti2016-07-171-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Added functions to check cloud files path and return path with hashed namesAndrew Manning2016-07-172-51/+6
* | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remoteAndrew Manning2016-07-167-5/+197
|\| | | | | | | | |
| * | | | | | | | | 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