aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Starting to make the import selection page after element scan.Andrew Manning2016-07-203-80/+176
* Importing webpage elements from manually entered cloud file path work. All de...Andrew Manning2016-07-173-7/+26
* Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-175-21/+48
|\
| * hide fullscreen button in embedphotos modal album viewMario Vavti2016-07-172-1/+3
| * boobooredmatrix2016-07-171-2/+2
| * some work on guest access token uiMario Vavti2016-07-173-37/+45
* | Added functions to check cloud files path and return path with hashed namesAndrew Manning2016-07-174-56/+91
* | Merge remote-tracking branch 'upstream/dev' into website-import-remoteAndrew Manning2016-07-1634-2397/+2326
|\|
| * check for variables after schema files have been addedMario Vavti2016-07-161-12/+12
| * check for variables in schemesMario Vavti2016-07-161-1/+1
| * hide/show mixupMario Vavti2016-07-161-3/+2
| * only use visibility for tabsMario Vavti2016-07-161-4/+4
| * os_delete_prohibitredmatrix2016-07-161-0/+4
| * add new service class restriction to the docoredmatrix2016-07-151-0/+1
| * add service class restrictions to access_tokensredmatrix2016-07-152-1/+11
| * remove expired access tokensredmatrix2016-07-151-0/+9
| * provide examples for using access tokens in urlsredmatrix2016-07-154-2/+20
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-1512-541/+35
| |\
| | * bump minor version because of jquery updateMario Vavti2016-07-152-10/+3
| | * round up heightMario Vavti2016-07-151-1/+1
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-155-1818/+1888
| | |\
| | * | add jquery migrate for version 3Mario Vavti2016-07-151-0/+2
| | * | upgrade to jquery-3.1 and minor fixesMario Vavti2016-07-1510-531/+30
| * | | login isn't always your email.redmatrix2016-07-151-1/+1
| * | | 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-153-2/+9
| * | cleanup and debug of atoken featureredmatrix2016-07-153-4/+12
| * | enforce non-empty name and token/password on access tokens until better check...redmatrix2016-07-152-1812/+1836
| |/
| * Here's the basic UI for the Zot Access Tokens, requires some minor cleanupredmatrix2016-07-143-1/+114
| * make the xchan_hash for the access token location independentredmatrix2016-07-142-16/+21
| * missing braceredmatrix2016-07-141-1/+1
| * schema updates for zot access tokensredmatrix2016-07-144-2/+77
| * add zat to aclredmatrix2016-07-141-1/+26
| * more ZAT workredmatrix2016-07-144-3/+37
| * first cut at zot access tokensredmatrix2016-07-142-24/+85
* | Stash changes to merge from devAndrew Manning2016-07-163-30/+52
* | Postpone remote folder import until filesystem mirroring matures.Andrew Manning2016-07-163-6/+55
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-147-32/+80
|\|
| * markdown is whitespace sensitiveredmatrix2016-07-141-1/+1
| * who are weredmatrix2016-07-141-0/+12
| * let abconfig specify a familyredmatrix2016-07-132-4/+6
| * document mod_acl a bit better and try to remove some redundancies and consoli...redmatrix2016-07-134-28/+62
* | Refactored the scan and import functions to reduce redundant code and simplif...Andrew Manning2016-07-142-373/+223
* | 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-133-20/+12
|\|
| * missing namespace prefix \redmatrix2016-07-121-1/+1
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 23:01:19 +0000