Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 3 | -5/+49 |
|\ | |||||
| * | provide examples for using access tokens in urls | redmatrix | 2016-07-15 | 1 | -0/+4 |
| | | |||||
| * | 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 | 1 | -2/+3 |
| |\ | |||||
| | * | more cleanup of atoken UI | redmatrix | 2016-07-15 | 1 | -0/+1 |
| | | | |||||
| | * | cleanup and debug of atoken feature | redmatrix | 2016-07-15 | 1 | -2/+2 |
| | | | |||||
| * | | upgrade to jquery-3.1 and minor fixes | Mario Vavti | 2016-07-15 | 2 | -5/+16 |
| |/ | |||||
| * | 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-12 | 5 | -10/+10 |
|\| | |||||
| * | do not use visibility for fullscreen button and move fullscreen button to ↵ | Mario Vavti | 2016-07-11 | 5 | -10/+10 |
| | | | | | | | | 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 | 1 | -0/+7 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-09 | 2 | -1/+80 |
|\| | |||||
| * | 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 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-01 | 2 | -14/+22 |
|\| | |||||
| * | ditch the change_view widget and make header fixed in fullscreen mode | Mario Vavti | 2016-07-01 | 2 | -14/+22 |
| | | |||||
* | | 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 | 4 | -2/+32 |
|\ | |||||
| * | 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 |
| | | |||||
| * | fix month view in fullscreen mode | Mario Vavti | 2016-06-28 | 1 | -1/+7 |
| | | |||||
| * | add letsencrypt x3 intermediate cert and new cert file, improve UX of new ↵ | redmatrix | 2016-06-27 | 1 | -0/+3 |
| | | | | | | | | registrations | ||||
* | | Replace homemade table of content generator with existing jQuery plugin. Now ↵ | Andrew Manning | 2016-06-30 | 1 | -0/+2 |
|/ | | | | toc is linked to document headings. | ||||
* | Merge pull request #438 from anaqreon/wiki | hubzilla | 2016-06-26 | 1 | -2/+131 |
|\ | | | | | Wiki post generation option and image embed tool | ||||
| * | A page name wrapped in double brackets is converted into a link to another ↵ | Andrew Manning | 2016-06-25 | 1 | -1/+1 |
| | | | | | | | | page in the current wiki | ||||
| * | Insert image links wherever cursor is in the editor | Andrew Manning | 2016-06-25 | 1 | -2/+2 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-25 | 4 | -10/+10 |
| |\ | |||||
| * | | Post generation about new wiki is optional, default is NOT to post. Fixed ↵ | Andrew Manning | 2016-06-25 | 1 | -1/+130 |
| | | | | | | | | | | | | bug in wiki creation. Added embed image dialog and album browser. | ||||
* | | | fix help link | Treer | 2016-06-26 | 1 | -1/+1 |
| |/ |/| | |||||
* | | add url permalink mf2 markup | Ben Roberts | 2016-06-24 | 1 | -1/+1 |
| | | |||||
* | | p-author missing from embedded h-card in items | Ben Roberts | 2016-06-23 | 1 | -1/+1 |
| | | |||||
* | | make dropdown-caret invoke the dropdown | redmatrix | 2016-06-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-06-23 | 1 | -6/+6 |
|\ \ | |||||
| * | | microformats 2 for posts | Ben Roberts | 2016-06-22 | 1 | -6/+6 |
| | | | |||||
* | | | code cleanup for profile_photos | redmatrix | 2016-06-23 | 1 | -1/+1 |
|/ / | |||||
* / | use the normal html escape for '@' in addresses rather than the high-plane ↵ | redmatrix | 2016-06-22 | 1 | -1/+1 |
|/ | | | | unicode variant. This makes it copy-able, but not easily scrape-able. | ||||
* | vcard spec changes | redmatrix | 2016-06-21 | 3 | -24/+30 |
| | |||||
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-20 | 1 | -1/+1 |
|\ | |||||
| * | the text link to a thing will take you to the local thing page, both as a ↵ | redmatrix | 2016-06-17 | 1 | -1/+1 |
| | | | | | | | | link for editing and as a destination in case there is no thing photo. If there's a photo, the photo link will take you to the thing URL. | ||||
* | | Do not change active page commit until user reverts the page | Andrew Manning | 2016-06-20 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-17 | 1 | -1/+6 |
|\| | |||||
| * | only use height: auto for week and day view | Mario Vavti | 2016-06-17 | 1 | -1/+6 |
| | | |||||
* | | Wiki page revision comparison tool with diff displayed in modal dialog. ↵ | Andrew Manning | 2016-06-17 | 2 | -14/+79 |
|/ | | | | Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode | ||||
* | Rename page feature added. Fixed bug in git commit function and other minor ↵ | Andrew Manning | 2016-06-15 | 1 | -1/+40 |
| | | | | fixes. | ||||
* | Move javascript functions back to jot-header.tpl | Andrew Manning | 2016-06-12 | 1 | -0/+83 |
| | |||||
* | Photo embed button with album browser works in new post editor. | Andrew Manning | 2016-06-12 | 2 | -84/+1 |
| |