aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into website-import-remoteAndrew Manning2016-07-163-5/+49
|\
| * provide examples for using access tokens in urlsredmatrix2016-07-151-0/+4
| |
| * round up heightMario Vavti2016-07-151-1/+1
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-151-2/+3
| |\
| | * more cleanup of atoken UIredmatrix2016-07-151-0/+1
| | |
| | * cleanup and debug of atoken featureredmatrix2016-07-151-2/+2
| | |
| * | upgrade to jquery-3.1 and minor fixesMario Vavti2016-07-152-5/+16
| |/
| * Here's the basic UI for the Zot Access Tokens, requires some minor cleanupredmatrix2016-07-141-0/+28
| |
* | Stash changes to merge from devAndrew Manning2016-07-161-13/+6
| |
* | Postpone remote folder import until filesystem mirroring matures.Andrew Manning2016-07-161-3/+14
| |
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-125-10/+10
|\|
| * do not use visibility for fullscreen button and move fullscreen button to ↵Mario Vavti2016-07-115-10/+10
| | | | | | | | the right
* | Import blocks from zip file, but needs updates as detailed in ↵Andrew Manning2016-07-121-2/+2
| | | | | | | | https://gitlab.com/zot/hubsites/merge_requests/2
* | Clearer import control interfaceAndrew Manning2016-07-101-6/+22
| |
* | First draft of website import toolsAndrew Manning2016-07-101-0/+7
| |
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-092-1/+80
|\|
| * hide the redeliver option one level down since it should rarely be needed by ↵redmatrix2016-07-071-1/+8
| | | | | | | | folks outside of shared hosting.
| * force immediate avatar updateTreer2016-07-031-0/+72
| |
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-012-14/+22
|\|
| * ditch the change_view widget and make header fixed in fullscreen modeMario Vavti2016-07-012-14/+22
| |
* | JavaScript popup for page delete confirmationAndrew Manning2016-07-011-0/+3
|/
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-304-2/+32
|\
| * templatise the Dreport page and add a redeliver option for when things stuff ↵redmatrix2016-06-291-0/+21
| | | | | | | | up badly.
| * only request geolocation permission if we're creating a post.redmatrix2016-06-291-1/+1
| |
| * fix month view in fullscreen modeMario Vavti2016-06-281-1/+7
| |
| * add letsencrypt x3 intermediate cert and new cert file, improve UX of new ↵redmatrix2016-06-271-0/+3
| | | | | | | | registrations
* | Replace homemade table of content generator with existing jQuery plugin. Now ↵Andrew Manning2016-06-301-0/+2
|/ | | | toc is linked to document headings.
* Merge pull request #438 from anaqreon/wikihubzilla2016-06-261-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 Manning2016-06-251-1/+1
| | | | | | | | page in the current wiki
| * Insert image links wherever cursor is in the editorAndrew Manning2016-06-251-2/+2
| |
| * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-254-10/+10
| |\
| * | Post generation about new wiki is optional, default is NOT to post. Fixed ↵Andrew Manning2016-06-251-1/+130
| | | | | | | | | | | | bug in wiki creation. Added embed image dialog and album browser.
* | | fix help linkTreer2016-06-261-1/+1
| |/ |/|
* | add url permalink mf2 markupBen Roberts2016-06-241-1/+1
| |
* | p-author missing from embedded h-card in itemsBen Roberts2016-06-231-1/+1
| |
* | make dropdown-caret invoke the dropdownredmatrix2016-06-231-1/+1
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-231-6/+6
|\ \
| * | microformats 2 for postsBen Roberts2016-06-221-6/+6
| | |
* | | code cleanup for profile_photosredmatrix2016-06-231-1/+1
|/ /
* / use the normal html escape for '@' in addresses rather than the high-plane ↵redmatrix2016-06-221-1/+1
|/ | | | unicode variant. This makes it copy-able, but not easily scrape-able.
* vcard spec changesredmatrix2016-06-213-24/+30
|
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-201-1/+1
|\
| * the text link to a thing will take you to the local thing page, both as a ↵redmatrix2016-06-171-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 pageAndrew Manning2016-06-201-1/+2
| |
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-171-1/+6
|\|
| * only use height: auto for week and day viewMario Vavti2016-06-171-1/+6
| |
* | Wiki page revision comparison tool with diff displayed in modal dialog. ↵Andrew Manning2016-06-172-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 Manning2016-06-151-1/+40
| | | | fixes.
* Move javascript functions back to jot-header.tplAndrew Manning2016-06-121-0/+83
|
* Photo embed button with album browser works in new post editor.Andrew Manning2016-06-122-84/+1
|