Commit Graph
1672 Commits
Author SHA1 Message Date
Andrew Manning 75fb065526 Merge remote-tracking branch 'upstream/dev' into website-import 2016-07-17 11:54:36 -04:00
Mario Vavti 2b674d4cd9 hide fullscreen button in embedphotos modal album view 2016-07-17 12:54:10 +02:00
redmatrix 5d0ddb3123 booboo 2016-07-17 02:49:41 -07:00
Mario Vavti f39d20ac97 some work on guest access token ui 2016-07-17 11:29:37 +02:00
Andrew Manning 99354ac576 Merge remote-tracking branch 'upstream/dev' into website-import-remote 2016-07-16 21:04:04 -04:00
Andrew Manning e7b8531751 Stash changes to merge from dev 2016-07-16 21:02:13 -04:00
Andrew Manning ff2f599142 Postpone remote folder import until filesystem mirroring matures. 2016-07-16 19:25:44 -04:00
redmatrix f3aff45042 provide examples for using access tokens in urls 2016-07-15 16:31:21 -07:00
Mario Vavti 4a2fb8336e round up height 2016-07-15 14:23:10 +02:00
Mario Vavti 34a16e0ab9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-07-15 13:21:07 +02:00
Mario Vavti 2e32b5f467 upgrade to jquery-3.1 and minor fixes 2016-07-15 13:20:00 +02:00
redmatrix d54f5a3831 more cleanup of atoken UI 2016-07-15 01:43:09 -07:00
redmatrix 5e475acb85 cleanup and debug of atoken feature 2016-07-15 01:33:28 -07:00
redmatrix 7ee7f00bf3 Here's the basic UI for the Zot Access Tokens, requires some minor cleanup 2016-07-14 22:41:53 -07:00
Andrew Manning 5131759823 Merge remote-tracking branch 'upstream/dev' into website-import 2016-07-12 21:43:05 -04:00
Andrew Manning 1e4ef81244 Import blocks from zip file, but needs updates as detailed in https://gitlab.com/zot/hubsites/merge_requests/2 2016-07-12 21:41:37 -04:00
Mario Vavti d5afd0d7c2 do not use visibility for fullscreen button and move fullscreen button to the right 2016-07-11 12:49:53 +02:00
Andrew Manning c5e534c0cb Clearer import control interface 2016-07-10 07:21:52 -04:00
Andrew Manning a338a97d5b First draft of website import tools 2016-07-10 06:58:20 -04:00
Andrew Manning 47d7fc70e8 Merge remote-tracking branch 'upstream/dev' into wiki 2016-07-09 20:17:20 -04:00
redmatrix 233cfc29d6 hide the redeliver option one level down since it should rarely be needed by folks outside of shared hosting. 2016-07-07 17:23:52 -07:00
Treer 5c062aaec4 force immediate avatar update 2016-07-03 22:38:05 +10:00
Andrew Manning 0630609d6e Merge remote-tracking branch 'upstream/dev' into wiki 2016-07-01 06:36:25 -04:00
Andrew Manning 205924ff29 JavaScript popup for page delete confirmation 2016-07-01 06:35:49 -04:00
Mario Vavti 7371e08625 ditch the change_view widget and make header fixed in fullscreen mode 2016-07-01 12:21:19 +02:00
Andrew Manning 0fd8eeec23 Merge remote-tracking branch 'upstream/dev' into wiki 2016-06-30 21:51:33 -04:00
Andrew Manning 7124c0aee5 Replace homemade table of content generator with existing jQuery plugin. Now toc is linked to document headings. 2016-06-30 21:50:38 -04:00
redmatrix bfe84a9ff7 templatise the Dreport page and add a redeliver option for when things stuff up badly. 2016-06-29 22:46:47 -07:00
redmatrix df4ff26845 only request geolocation permission if we're creating a post. 2016-06-29 17:53:59 -07:00
Mario Vavti 7b2d54dffa fix month view in fullscreen mode 2016-06-28 13:44:32 +02:00
redmatrix b155e93ab1 add letsencrypt x3 intermediate cert and new cert file, improve UX of new registrations 2016-06-27 19:04:00 -07:00
hubzillaandGitHub 8c4481733f Merge pull request #438 from anaqreon/wiki
Wiki post generation option and image embed tool
2016-06-26 08:25:31 +10:00
Andrew Manning 0df3978cc5 A page name wrapped in double brackets is converted into a link to another page in the current wiki 2016-06-25 14:29:52 -05:00
TreerandGitHub bd4a88cd3e fix help link 2016-06-26 03:17:10 +10:00
Andrew Manning 241b257556 Insert image links wherever cursor is in the editor 2016-06-25 06:50:24 -05:00
Andrew Manning 83a42afddf Merge remote-tracking branch 'upstream/dev' into wiki 2016-06-25 06:30:15 -05:00
Andrew Manning 780f83a118 Post generation about new wiki is optional, default is NOT to post. Fixed bug in wiki creation. Added embed image dialog and album browser. 2016-06-25 06:27:14 -05:00
Ben Roberts 812dc9e898 add url permalink mf2 markup 2016-06-24 00:45:39 -04:00
Ben Roberts 5162c55e5d p-author missing from embedded h-card in items 2016-06-23 23:46:02 -04:00
redmatrix 096619dbbe make dropdown-caret invoke the dropdown 2016-06-23 20:13:20 -07:00
redmatrix 2a32713dfc Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-06-23 01:18:17 -07:00
redmatrix acf26d5c63 code cleanup for profile_photos 2016-06-23 01:17:44 -07:00
Ben Roberts ab628eb2a3 microformats 2 for posts 2016-06-22 23:59:27 -04:00
redmatrix ec8091a102 use the normal html escape for '@' in addresses rather than the high-plane unicode variant. This makes it copy-able, but not easily scrape-able. 2016-06-22 18:00:18 -07:00
redmatrix 2a840460dd vcard spec changes 2016-06-21 19:25:14 -07:00
Andrew Manning 8cd9a1e4fc Merge remote-tracking branch 'upstream/dev' into wiki 2016-06-20 13:07:29 -04:00
Andrew Manning 20b4fc9198 Do not change active page commit until user reverts the page 2016-06-20 13:05:18 -04:00
redmatrix 2e7606f569 the text link to a thing will take you to the local thing page, both as a 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. 2016-06-17 21:44:08 -07:00
Andrew Manning 80d3a831f3 Merge remote-tracking branch 'upstream/dev' into wiki 2016-06-17 06:36:09 -04:00
Andrew Manning 961539258b Wiki page revision comparison tool with diff displayed in modal dialog. 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 2016-06-17 06:33:39 -04:00