aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-2118-183/+177
|\
| * issue #453 and a bug noted from the logfiles related to the schema change las...redmatrix2016-07-201-1/+3
| * Merge branch 'dev' into permsredmatrix2016-07-206-85/+14
| |\
| | * sort out some of the authentication mess - with luck this may fix the DAV aut...redmatrix2016-07-206-85/+14
| * | Merge branch 'dev' into permsredmatrix2016-07-201-1/+2
| |\|
| * | fix the forum detection in include/zotredmatrix2016-07-191-2/+2
| * | permission fixesredmatrix2016-07-192-5/+7
| * | translate more old perms callsredmatrix2016-07-192-3/+3
| * | more perms work (a lot more)redmatrix2016-07-182-30/+38
| * | more perms workredmatrix2016-07-181-0/+9
| * | Merge branch 'dev' into permsredmatrix2016-07-177-4/+180
| |\ \
| * | | more perms workredmatrix2016-07-132-8/+14
| * | | deprecate/remove json_decode_plusredmatrix2016-07-132-4/+4
| * | | lots more permission workredmatrix2016-07-133-21/+42
| * | | Merge branch 'dev' into permsredmatrix2016-07-132-26/+60
| |\ \ \
| * | | | more work on permsredmatrix2016-07-123-18/+10
| * | | | Merge branch 'dev' into permsredmatrix2016-07-129-22/+10
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' into permsredmatrix2016-07-115-36/+15
| |\ \ \ \ \
| * | | | | | more perms work - notably the stuff in public_permsredmatrix2016-07-111-7/+13
| * | | | | | more permissions workredmatrix2016-07-092-3/+19
| * | | | | | more work on permsredmatrix2016-07-091-1/+2
| * | | | | | more heavy lifting on xtensible permsredmatrix2016-07-042-5/+8
| * | | | | | more heavy lifting on extensible permsredmatrix2016-07-041-3/+8
| * | | | | | perms work - settings pageredmatrix2016-07-031-20/+13
* | | | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-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 remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-202-0/+4
|\| | | | |
| * | | | | 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-172-0/+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-171-51/+5
* | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remoteAndrew Manning2016-07-164-4/+176
|\| | | | |
| * | | | | add service class restrictions to access_tokensredmatrix2016-07-151-0/+10
| * | | | | 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
| | |_|_|/ | |/| | |
* | | | | Stash changes to merge from devAndrew Manning2016-07-161-13/+43
* | | | | Postpone remote folder import until filesystem mirroring matures.Andrew Manning2016-07-161-2/+36
* | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-141-25/+59
|\| | | |
| * | | | document mod_acl a bit better and try to remove some redundancies and consoli...redmatrix2016-07-131-25/+59
* | | | | Refactored the scan and import functions to reduce redundant code and simplif...Andrew Manning2016-07-141-373/+23
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 08:43:04 +0000