aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | 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
* | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-1227-56/+54
|\| |
| * | the abconfig defaults weren't changed in the schema files when they were chan...redmatrix2016-07-122-2/+2
| * | move permissiondescription class to zotlabs/libredmatrix2016-07-1111-26/+12
| * | use the get_hostname function rather than parse the urlredmatrix2016-07-111-1/+1
| * | document the new change_channel hookredmatrix2016-07-112-0/+14
| * | create change_channel hookredmatrix2016-07-111-0/+4
| * | force non-null sess_dataredmatrix2016-07-111-1/+2
| * | use the profile_uid here.redmatrix2016-07-111-7/+2
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-118-18/+16
| |\ \
| | * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-111-5/+0
| | |\ \
| | | * \ Merge pull request #451 from git-marijus/devhubzilla2016-07-111-5/+0
| | | |\ \
| | | | * | remove check for mcryptMario Vavti2016-07-101-5/+0
| | | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-105-1284/+1313
| | | | |\ \ | | | | |/ / | | | |/| |
| | | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-072-19/+10
| | | | |\ \
| | * | | | | do not use visibility for fullscreen button and move fullscreen button to the...Mario Vavti2016-07-117-13/+16
| | |/ / / /
| * / / / / more sql fine tuningredmatrix2016-07-091-1/+1
| |/ / / /
* | | | | Import blocks from zip file, but needs updates as detailed in https://gitlab....Andrew Manning2016-07-122-2/+224
* | | | | Clearer import control interfaceAndrew Manning2016-07-102-8/+28
* | | | | First draft of website import toolsAndrew Manning2016-07-104-0/+46
| |_|_|/ |/| | |
* | | | Set max-width for embedded imagesAndrew Manning2016-07-091-0/+4
* | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-0922-1674/+1724
|\| | |
| * | | some work on the forum widget queriesredmatrix2016-07-092-1273/+1292
| * | | gak one more typoredmatrix2016-07-071-1/+1