aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
* | 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-142-27/+63
|\|
| * let abconfig specify a familyredmatrix2016-07-131-2/+4
| * 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
* | Blocks, pages, and layouts import from zip file. Layouts are not applied to p...Andrew Manning2016-07-131-9/+190
* | Updated import_blocks for database callsAndrew Manning2016-07-131-5/+3
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-131-1/+1
|\|
| * missing namespace prefix \redmatrix2016-07-121-1/+1
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-1213-35/+184
|\|
| * move permissiondescription class to zotlabs/libredmatrix2016-07-1110-22/+180
| * 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
* | Import blocks from zip file, but needs updates as detailed in https://gitlab....Andrew Manning2016-07-121-0/+222
|/
* 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
| |/ |/|
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 02:05:26 +0000