Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 34 | -2397/+2326 |
|\ | |||||
| * | check for variables after schema files have been added | Mario Vavti | 2016-07-16 | 1 | -12/+12 |
| | | |||||
| * | check for variables in schemes | Mario Vavti | 2016-07-16 | 1 | -1/+1 |
| | | |||||
| * | hide/show mixup | Mario Vavti | 2016-07-16 | 1 | -3/+2 |
| | | |||||
| * | only use visibility for tabs | Mario Vavti | 2016-07-16 | 1 | -4/+4 |
| | | |||||
| * | os_delete_prohibit | redmatrix | 2016-07-16 | 1 | -0/+4 |
| | | |||||
| * | add new service class restriction to the doco | redmatrix | 2016-07-15 | 1 | -0/+1 |
| | | |||||
| * | add service class restrictions to access_tokens | redmatrix | 2016-07-15 | 2 | -1/+11 |
| | | |||||
| * | remove expired access tokens | redmatrix | 2016-07-15 | 1 | -0/+9 |
| | | |||||
| * | provide examples for using access tokens in urls | redmatrix | 2016-07-15 | 4 | -2/+20 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-15 | 12 | -541/+35 |
| |\ | |||||
| | * | bump minor version because of jquery update | Mario Vavti | 2016-07-15 | 2 | -10/+3 |
| | | | |||||
| | * | round up height | Mario Vavti | 2016-07-15 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-15 | 5 | -1818/+1888 |
| | |\ | |||||
| | * | | add jquery migrate for version 3 | Mario Vavti | 2016-07-15 | 1 | -0/+2 |
| | | | | |||||
| | * | | upgrade to jquery-3.1 and minor fixes | Mario Vavti | 2016-07-15 | 10 | -531/+30 |
| | | | | |||||
| * | | | login isn't always your email. | redmatrix | 2016-07-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | mod_home: if using an atoken login on the home page redirect to the channel ↵ | redmatrix | 2016-07-15 | 1 | -0/+13 |
| | |/ | |/| | | | | | | | page of the channel that owns the atoken. | ||||
| * | | make lockview work with throwaway identities | redmatrix | 2016-07-15 | 1 | -2/+33 |
| | | | |||||
| * | | more cleanup of atoken UI | redmatrix | 2016-07-15 | 3 | -2/+9 |
| | | | |||||
| * | | cleanup and debug of atoken feature | redmatrix | 2016-07-15 | 3 | -4/+12 |
| | | | |||||
| * | | enforce non-empty name and token/password on access tokens until better ↵ | redmatrix | 2016-07-15 | 2 | -1812/+1836 |
| |/ | | | | | | | checks are instituted. | ||||
| * | Here's the basic UI for the Zot Access Tokens, requires some minor cleanup | redmatrix | 2016-07-14 | 3 | -1/+114 |
| | | |||||
| * | make the xchan_hash for the access token location independent | redmatrix | 2016-07-14 | 2 | -16/+21 |
| | | |||||
| * | missing brace | redmatrix | 2016-07-14 | 1 | -1/+1 |
| | | |||||
| * | schema updates for zot access tokens | redmatrix | 2016-07-14 | 4 | -2/+77 |
| | | |||||
| * | add zat to acl | redmatrix | 2016-07-14 | 1 | -1/+26 |
| | | |||||
| * | more ZAT work | redmatrix | 2016-07-14 | 4 | -3/+37 |
| | | |||||
| * | first cut at zot access tokens | redmatrix | 2016-07-14 | 2 | -24/+85 |
| | | |||||
* | | Stash changes to merge from dev | Andrew Manning | 2016-07-16 | 3 | -30/+52 |
| | | |||||
* | | Postpone remote folder import until filesystem mirroring matures. | Andrew Manning | 2016-07-16 | 3 | -6/+55 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-14 | 7 | -32/+80 |
|\| | |||||
| * | markdown is whitespace sensitive | redmatrix | 2016-07-14 | 1 | -1/+1 |
| | | |||||
| * | who are we | redmatrix | 2016-07-14 | 1 | -0/+12 |
| | | |||||
| * | let abconfig specify a family | redmatrix | 2016-07-13 | 2 | -4/+6 |
| | | |||||
| * | document mod_acl a bit better and try to remove some redundancies and ↵ | redmatrix | 2016-07-13 | 4 | -28/+62 |
| | | | | | | | | consolidate the various options | ||||
* | | Refactored the scan and import functions to reduce redundant code and ↵ | Andrew Manning | 2016-07-14 | 2 | -373/+223 |
| | | | | | | | | simplify logic. Import of pages, layouts, and blocks works. | ||||
* | | Blocks, pages, and layouts import from zip file. Layouts are not applied to ↵ | Andrew Manning | 2016-07-13 | 1 | -9/+190 |
| | | | | | | | | pages until imported twice though. | ||||
* | | Updated import_blocks for database calls | Andrew Manning | 2016-07-13 | 1 | -5/+3 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-13 | 3 | -20/+12 |
|\| | |||||
| * | missing namespace prefix \ | redmatrix | 2016-07-12 | 1 | -1/+1 |
| | | |||||
| * | update_remote_id - updated to work with iconfig | redmatrix | 2016-07-12 | 1 | -18/+5 |
| | | |||||
| * | don't try to send sync packets to dead sites. | redmatrix | 2016-07-12 | 1 | -1/+6 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-12 | 27 | -56/+54 |
|\| | |||||
| * | the abconfig defaults weren't changed in the schema files when they were ↵ | redmatrix | 2016-07-12 | 2 | -2/+2 |
| | | | | | | | | changed in the code | ||||
| * | move permissiondescription class to zotlabs/lib | redmatrix | 2016-07-11 | 11 | -26/+12 |
| | | |||||
| * | use the get_hostname function rather than parse the url | redmatrix | 2016-07-11 | 1 | -1/+1 |
| | | |||||
| * | document the new change_channel hook | redmatrix | 2016-07-11 | 2 | -0/+14 |
| | | |||||
| * | create change_channel hook | redmatrix | 2016-07-11 | 1 | -0/+4 |
| | | |||||
| * | force non-null sess_data | redmatrix | 2016-07-11 | 1 | -1/+2 |
| | |