Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 15 | -558/+102 |
|\ | |||||
| * | 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 |
| | | |||||
| * | provide examples for using access tokens in urls | redmatrix | 2016-07-15 | 3 | -0/+13 |
| | | |||||
| * | bump minor version because of jquery update | Mario Vavti | 2016-07-15 | 1 | -9/+2 |
| | | |||||
| * | 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 | 2 | -2/+14 |
| |\ | |||||
| | * | more cleanup of atoken UI | redmatrix | 2016-07-15 | 2 | -1/+5 |
| | | | |||||
| | * | cleanup and debug of atoken feature | redmatrix | 2016-07-15 | 2 | -2/+10 |
| | | | |||||
| * | | 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 |
| |/ | |||||
| * | Here's the basic UI for the Zot Access Tokens, requires some minor cleanup | redmatrix | 2016-07-14 | 1 | -0/+28 |
| | | |||||
* | | Stash changes to merge from dev | Andrew Manning | 2016-07-16 | 1 | -13/+6 |
| | | |||||
* | | Postpone remote folder import until filesystem mirroring matures. | Andrew Manning | 2016-07-16 | 1 | -3/+14 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-14 | 3 | -3/+3 |
|\| | |||||
| * | document mod_acl a bit better and try to remove some redundancies and ↵ | redmatrix | 2016-07-13 | 3 | -3/+3 |
| | | | | | | | | consolidate the various options | ||||
* | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-12 | 7 | -13/+16 |
|\| | |||||
| * | do not use visibility for fullscreen button and move fullscreen button to ↵ | Mario Vavti | 2016-07-11 | 7 | -13/+16 |
| | | | | | | | | the right | ||||
* | | Import blocks from zip file, but needs updates as detailed in ↵ | Andrew Manning | 2016-07-12 | 1 | -2/+2 |
| | | | | | | | | https://gitlab.com/zot/hubsites/merge_requests/2 | ||||
* | | Clearer import control interface | Andrew Manning | 2016-07-10 | 1 | -6/+22 |
| | | |||||
* | | First draft of website import tools | Andrew Manning | 2016-07-10 | 2 | -0/+8 |
| | | |||||
* | | Set max-width for embedded images | Andrew Manning | 2016-07-09 | 1 | -0/+4 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-09 | 3 | -3/+82 |
|\| | |||||
| * | hide the redeliver option one level down since it should rarely be needed by ↵ | redmatrix | 2016-07-07 | 1 | -1/+8 |
| | | | | | | | | folks outside of shared hosting. | ||||
| * | force immediate avatar update | Treer | 2016-07-03 | 1 | -0/+72 |
| | | |||||
| * | use visibility instead of display to hide elements | Mario Vavti | 2016-07-01 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-01 | 4 | -22/+24 |
|\| | |||||
| * | ditch the change_view widget and make header fixed in fullscreen mode | Mario Vavti | 2016-07-01 | 4 | -22/+24 |
| | | |||||
* | | JavaScript popup for page delete confirmation | Andrew Manning | 2016-07-01 | 1 | -0/+3 |
|/ | |||||
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-30 | 9 | -12/+53 |
|\ | |||||
| * | templatise the Dreport page and add a redeliver option for when things stuff ↵ | redmatrix | 2016-06-29 | 1 | -0/+21 |
| | | | | | | | | up badly. | ||||
| * | only request geolocation permission if we're creating a post. | redmatrix | 2016-06-29 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 1 | -1/+7 |
| |\ | |||||
| | * | fix month view in fullscreen mode | Mario Vavti | 2016-06-28 | 1 | -1/+7 |
| | | | |||||
| * | | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 2 | -8/+0 |
| |\| | |||||
| | * | update fullcalendar to version 2.8.0 | Mario Vavti | 2016-06-28 | 2 | -8/+0 |
| | | | |||||
| * | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 1 | -0/+3 |
| |\| | |||||
| | * | add letsencrypt x3 intermediate cert and new cert file, improve UX of new ↵ | redmatrix | 2016-06-27 | 1 | -0/+3 |
| | | | | | | | | | | | | registrations | ||||
| * | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-26 | 2 | -3/+132 |
| |\| | |||||
| * | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-24 | 3 | -4/+4 |
| |\ \ | |||||
| * \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-23 | 2 | -7/+7 |
| |\ \ \ | |||||
| * \ \ \ | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-22 | 3 | -24/+30 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-21 | 2 | -14/+80 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 37 | -86783/+61544 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | return something so we can make a conclusion | Mario Vavti | 2016-06-19 | 1 | -0/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-19 | 9 | -0/+21512 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ |