Commit graph

1159 commits

Author SHA1 Message Date
Yukai Huang
4bbe035beb Merge branch 'master' into frontend-next 2017-01-21 12:08:52 +08:00
Wu Cheng-Han
e00daee6c0 Update to prevent all empty link change hash 2017-01-16 12:42:21 +08:00
Wu Cheng-Han
091e7271e0 Fix pagination should hide on refresh history 2017-01-16 12:24:40 +08:00
Wu Cheng-Han
53223b5e2c Update index layout to add profile on navbar 2017-01-16 12:06:04 +08:00
Wu Cheng-Han
f2ee897699 Fix to prevent hash change on click nav item on index 2017-01-16 12:04:11 +08:00
Wu Cheng-Han
5751578275 Update to remove history pagination animation on refresh 2017-01-15 17:23:33 +08:00
Wu Cheng-Han
f2a441061b Fix checkLoginStateChanged might fall into infinite loop while calling loginStateChangeEvent 2017-01-15 17:23:19 +08:00
Yukai Huang
c0e8306961 Merge branch 'frontend-next' into t216-refactor-common 2017-01-15 11:33:22 +08:00
Yukai Huang
04292240d6 Minor style update 2017-01-14 15:47:13 +08:00
Yukai Huang
a541569d7e Remove old config.js.example 2017-01-13 23:12:27 +08:00
Yukai Huang
2408ff4ba9 Add default value for config 2017-01-13 23:12:17 +08:00
Yukai Huang
0fca629c34 Rename common.js to login.js 2017-01-13 23:06:31 +08:00
Yukai Huang
3d6b319216 Merge branch 'master' into frontend-next 2017-01-13 22:53:33 +08:00
Yukai Huang
c2a8911b9c Move config variable to lib/config 2017-01-13 22:46:38 +08:00
Wu Cheng-Han
86f0b10775 Fix permission dropdown text might out of range in smaller screen 2017-01-13 00:03:29 +08:00
Max Wu
4851098477 Merge pull request #317 from SISheogorath/master+allowEmailRegister
Add `allowemailregister` option
2017-01-12 23:37:28 +08:00
Wu Cheng-Han
8b378d7847 Update to use shorter wording in limited and protected permissions 2017-01-12 23:36:23 +08:00
Sheogorath
747629e549 Add allowemailregister option 2017-01-12 13:54:45 +01:00
Wu Cheng-Han
5f65795e79 Fix permission order and keep wording consistency 2017-01-12 19:04:17 +08:00
Wu Cheng-Han
ffa14cfeef Fix sortOnlineUserList might not check property existence before comparsion 2017-01-12 17:17:36 +08:00
Wu Cheng-Han
0432fef267 Fix history list might check pagination on clear and open 2017-01-12 17:14:32 +08:00
Wu Cheng-Han
42d684329f Workaround text shadow for font antialias might cause cut off in Edge 2017-01-12 17:13:52 +08:00
Max Wu
a8068d38d5 Merge pull request #313 from elct9620/feature/disable_anonymous_view
WIP: Add options to limit anonymous view note
2017-01-10 20:23:47 +08:00
蒼時弦也
d6be0cf755 Update limite icon to fa-id-card 2017-01-10 20:22:06 +08:00
蒼時弦也
a9fe43ac3a Update limited/protected permission icon 2017-01-10 17:22:57 +08:00
蒼時弦也
758607d378 Add fa-stack style to public/js/index.js 2017-01-10 15:15:12 +08:00
蒼時弦也
7b02c48d93 Adjust permission order to more clarly 2017-01-10 14:13:30 +08:00
蒼時弦也
89b8ddeaba Add limited and protected permission 2017-01-10 10:02:37 +08:00
neopostmodern
ff545b2688 Allow displaying LDAP provider name on sign-in modal 2017-01-09 12:49:23 +01:00
Max Wu
b13635aac9 Merge pull request #279 from alecdwm/ldap-auth
Support for LDAP server authentication
2017-01-09 00:49:40 +08:00
Yukai Huang
3566d71aea Merge branch 'master' into frontend-next 2017-01-07 00:05:15 +08:00
Yukai Huang
fce08cc164 Convert history.js to es6 2017-01-05 20:56:16 +08:00
Yukai Huang
71aece7429 Convert cover.js to es6 2017-01-05 18:10:55 +08:00
Yukai Huang
47d7ff2561 Convert extra.js to es6 2017-01-05 17:52:32 +08:00
Yukai Huang
6a06c0bb9f Convert common.js to es6 2017-01-05 16:48:23 +08:00
Yukai Huang
45c202172e Convert pretty.js to es6 2017-01-05 16:19:13 +08:00
Yukai Huang
eb5e7ba0d1 Convert slide.js to es6 2017-01-05 16:17:28 +08:00
Wu Cheng-Han
23a12dd927 Fix for selectionObjects in OT CodeMirror adapter might call on undefined 2017-01-05 00:00:05 +08:00
Wu Cheng-Han
eaf9218f61 Update to show yaml-metadata and diagram parsing error in the view 2017-01-04 23:59:28 +08:00
Wu Cheng-Han
08b04e9528 Workaround that graphviz might not recover from error 2017-01-04 23:59:12 +08:00
Yukai Huang
781f495f3e Convert synscroll to es6 2017-01-04 23:01:44 +08:00
Yukai Huang
65acaea8cf Merge branch 'master' into frontend-next 2017-01-02 15:09:19 +08:00
Wu Cheng-Han
ac2b100d35 Add back missing release-note link on index 2017-01-02 12:26:10 +08:00
Wu Cheng-Han
bd4335964d Mark as 0.5.0 2017-01-02 11:19:01 +08:00
Wu Cheng-Han
d74fea1d10 Update year to 2017 2017-01-02 11:14:25 +08:00
Wu Cheng-Han
db0ea715c6 Update to improve editor performance by debounce checkEditorScrollbar event 2017-01-02 11:06:02 +08:00
Wu Cheng-Han
0db4358adb Fix authorship might losing update event because of throttling 2017-01-02 11:05:49 +08:00
Wu Cheng-Han
d9e19b6029 Update to remove null byte before saving to DB and remove null byte on changes 2017-01-02 11:05:05 +08:00
Wu Cheng-Han
c904083d1f Remove manual LZString compression for partial socket io event data 2017-01-02 10:52:47 +08:00
James Stephenson
ec1ae8c6b5 Added Esperanto translation
Translation by Jonathan Powell and James Stephenson
2016-12-30 22:02:57 -05:00
Wu Cheng-Han
0c42780a39 Update features.md publish button name and icon 2016-12-24 17:23:04 +08:00
Wu Cheng-Han
aff206ca95 Fix js-url not import correctly 2016-12-24 17:02:03 +08:00
Yukai Huang
99dd107724 Basic setup for Vue app 2016-12-24 11:50:57 +08:00
Yukai Huang
a06fad974e Install vue and babel dependency 2016-12-24 11:10:18 +08:00
Yukai Huang
d6ae7a36ae Fix module variable require 2016-12-24 11:09:07 +08:00
Florian Rhiem
fdea226159 Fixed typo: anonmyous 2016-12-21 14:36:54 +01:00
Wu Cheng-Han
11d6b24561 Fix codemirror spell checker not considering abbreviation which contain apostrophe in word 2016-12-20 20:34:20 +08:00
Wu Cheng-Han
418a852cc4 Fix mathjax not able to render issue 2016-12-20 03:05:59 +08:00
Wu Cheng-Han
39521f25a7 Mark as 0.4.6 2016-12-19 17:30:33 +08:00
Wu Cheng-Han
c8d37dd192 Update to handle graphviz output empty graph 2016-12-19 16:53:54 +08:00
Wu Cheng-Han
92f2a4acf0 Remove unused vendor code and add fix related usages 2016-12-19 16:28:59 +08:00
Wu Cheng-Han
276d500406 Upgrade dependencies 2016-12-19 16:20:27 +08:00
Wu Cheng-Han
c6742e50ee Remove unused vendor code and add missing dependency 2016-12-19 16:13:56 +08:00
Wu Cheng-Han
1892fe70f6 Fix slide mode on print pdf not finish view rendering 2016-12-18 22:53:31 +08:00
Wu Cheng-Han
3eb2159ded Fix slide print-pdf mode scrollbar might be visible 2016-12-18 22:53:00 +08:00
Wu Cheng-Han
5c7eb48319 Add support of allow anonymous config option with correspond modifications 2016-12-15 14:11:23 +08:00
Wu Cheng-Han
cf8bae32d1 Fix gist-embed styles conflicts 2016-12-15 10:44:46 +08:00
alecdwm
72a0e90f7d LDAP signin form moved to main signin-modal
- previously was a separate modal
- now is located on main modal, like email auth
2016-12-14 12:56:26 +01:00
alecdwm
02e9927714 Initial support for LDAP server authentication
Limitations as of this commit:

- tlsOptions can only be specified in config.json, not as env vars
- authentication failures are not yet gracefully handled by the UI
  - instead the error message is shown on a blank page (/auth/ldap)
- no email address is associated with the LDAP user's account
- no picture/profile URL is associated with the LDAP user's account
- we might have to generate our own access + refresh tokens,
  because we aren't using oauth. The currently generated
  tokens are just a placeholder.
- 'LDAP Sign in' needs to be translated to each locale
2016-12-13 22:41:07 +01:00
Wu Cheng-Han
00e284584e Switch email register and signin button order to make form default action as signin 2016-12-14 03:08:35 +08:00
Wu Cheng-Han
62c703baa1 Fix the generate template not including base url variable 2016-12-12 12:19:12 +08:00
Wu Cheng-Han
46752194e4 Update to make TOC syntax be case-insensitive 2016-12-12 10:49:23 +08:00
Wu Cheng-Han
36aa15f339 Fix reveal fade class conflict with bootstrap tooltip css and scrollbar might show up in print mode 2016-12-12 10:48:57 +08:00
Wu Cheng-Han
ecb956f515 Fix index signin and signout button might not shown if only email enabled 2016-12-07 21:19:06 +08:00
Wu Cheng-Han
dd284a7bd0 Fix textcomplete up side down option not set properly 2016-12-07 01:34:42 +08:00
Wu Cheng-Han
bbaf697687 Fix emoji textcomplete image path 2016-12-07 01:33:38 +08:00
Wu Cheng-Han
4bd5598568 Fix Facebook page link name 2016-12-06 22:15:34 +08:00
Wu Cheng-Han
0ffdb44793 Fix preferences checkbox might not vertical aligned in some browsers 2016-12-04 01:30:20 +08:00
Wu Cheng-Han
da46a3696b Add preferences to editor status bar and make allow override browser keymap option 2016-12-04 00:56:14 +08:00
Wu Cheng-Han
a73d9ce39e Update to support optional email register and signin 2016-12-02 01:58:14 +08:00
Wu Cheng-Han
52772829ce Fix history tags dropdown should unescape html 2016-11-29 21:33:29 +08:00
Wu Cheng-Han
c59b4cb883 Update webpack and slide resource loading to reduce pack size 2016-11-29 00:44:29 +08:00
Wu Cheng-Han
47d5efb29e Fix slide resource path and style load orders to avoid conflicts 2016-11-29 00:44:15 +08:00
Wu Cheng-Han
ead48e45e0 Fix header id and text might affects by mathjax tags 2016-11-28 22:15:07 +08:00
Wu Cheng-Han
de2067f7e8 Update to support typescript and jsx syntax highlighting 2016-11-28 18:34:08 +08:00
Wu Cheng-Han
5acf33b16b Fix google drive upload script not expose object correctly 2016-11-28 18:04:02 +08:00
Wu Cheng-Han
1ea84c2fb0 Remove unused css files 2016-11-28 02:15:10 +08:00
Wu Cheng-Han
af9e2fe664 Fix slide preview styles might overwrite code block styles 2016-11-28 02:14:29 +08:00
Wu Cheng-Han
9f79ed929e Update to move custom CodeMirror codebase to our own repo and update webpack build config 2016-11-28 01:36:48 +08:00
Wu Cheng-Han
3a305b8258 Update editor other cursor classes and adding option for other cursors features in CodeMirror 2016-11-28 01:20:23 +08:00
Max Wu
bd3d4958e4 Merge pull request #248 from hackmdio/file-upload-options
Support other options for image uploading
2016-11-27 10:54:00 +08:00
Wu Cheng-Han
76a6190dac Update dependency gist-embed to 2.6.0 2016-11-26 23:25:29 +08:00
Wu Cheng-Han
efd62bd1ca Optimize slide page resource packing and load orders, fix possible wrong chunks orders and font awesome version 2016-11-26 23:24:59 +08:00
Wu Cheng-Han
ad90643c94 Optimize pretty page resource packing and load orders 2016-11-26 23:22:47 +08:00
Wu Cheng-Han
5287d46931 Optimize hackmd resource packing and load orders 2016-11-26 23:18:51 +08:00
Wu Cheng-Han
3fbfdb7db8 Optimize index page resources packing and loads 2016-11-26 23:13:02 +08:00
Wu Cheng-Han
8c10c393ce Fix possible meta XSS in history list [Security Issue] 2016-11-26 22:56:03 +08:00
Wu Cheng-Han
9d4ede4cff Fix possible XSS in yaml-metadata and turn using ejs escape syntax than external lib [Security Issue] 2016-11-26 22:55:31 +08:00
Wu Cheng-Han
b43e63dd21 Update to support go in code block syntax highlighting 2016-11-26 22:48:20 +08:00
Wu Cheng-Han
79d5b2c37f Fix slide might able to add unsafe attribute on section tag which cause XSS [Security Issue] 2016-11-26 22:46:58 +08:00
Wu Cheng-Han
f86a9e0c4b Fix slide might trigger script when processing markdown which cause XSS [Security Issue] 2016-11-26 22:46:08 +08:00
Wu Cheng-Han
9383df59c9 Update socket.io to 1.6.0 2016-11-26 22:40:50 +08:00
Wu Cheng-Han
1ba46c95fb Update to separate polypill for IE to a template 2016-11-26 22:38:18 +08:00
Wu Cheng-Han
64d1d2c04b Fix published note won't scroll to hash on load 2016-11-26 19:46:20 +08:00
Wu Cheng-Han
80ee507951 Fix mathjax with blockquote might have race condition 2016-11-18 12:19:05 +08:00
Wu Cheng-Han
09e6596074 Update to support haskell syntax highlighting in code block 2016-11-18 12:17:37 +08:00
Peter Dave Hello
f8eb8fc9d8 Remove uesless executable permission for static files 2016-11-14 21:13:02 +08:00
Yukai Huang
81b368c11c upload image to public/uploads 2016-11-14 16:45:57 +08:00
Wu Cheng-Han
c5de552988 Fix index social foot style 2016-11-07 21:31:21 +08:00
Wu Cheng-Han
793aef0e2e Fix syntax highlighting not apply correctly in slides 2016-11-07 21:27:58 +08:00
Max Wu
8c5a5a0712 Merge pull request #243 from Yukaii/google-font-optional-cdn
Google font optional cdn
2016-11-04 13:08:59 +08:00
Wu Cheng-Han
2167570c11 Fix slide highlighting styles not apply properly and add missing styles dependency of prism in html export 2016-11-04 13:04:00 +08:00
Yukai Huang
0bc90258bf Add google font css for exported html 2016-11-03 14:54:24 +08:00
Yukai Huang
0b45312834 Add font css to templates 2016-11-03 14:51:28 +08:00
Yukai Huang
d4429aa42d Rename google font css 2016-11-03 14:51:04 +08:00
Wu Cheng-Han
ee96d88e81 Remove html.min.css since it will be built via webpack afterwards 2016-11-03 14:43:53 +08:00
Yukai Huang
0ef34ee9f1 Seperate cdn/local google font css 2016-11-03 14:20:35 +08:00
Yukai Huang
18011f06de Add fonts 2016-11-03 14:20:35 +08:00
Max Wu
11faadb684 Merge pull request #242 from Yukaii/webpack-stylesheet
Use webpack to bundle stylesheet
2016-11-03 14:17:10 +08:00
Wu Cheng-Han
734d475c0e Fix server reconnect might not resend pending operations 2016-11-03 14:04:53 +08:00
Yukai Huang
f1f8846b0a Config extra entry for html.min.css 2016-11-02 18:01:26 +08:00
Yukai Huang
3e23009663 Require slide mode stylesheets 2016-11-02 11:59:45 +08:00
Yukai Huang
58fedb01fa Require pretty stylesheets 2016-11-02 11:55:08 +08:00
Yukai Huang
55ddddd84b Require cover stylesheets 2016-11-02 11:26:25 +08:00
Yukai Huang
7a052b0dad Require index stylesheets 2016-11-02 11:26:06 +08:00
Wu Cheng-Han
25fa503981 Fix viewAjaxCallback might be called on null 2016-11-01 15:04:48 +08:00
Wu Cheng-Han
ba2bfa2188 Update to support summary tag 2016-10-29 23:43:58 +08:00
Wu Cheng-Han
70d2fa388e Fix slide export pdf styles not applied issue and add shiv and shim for IE 2016-10-29 23:35:10 +08:00
Wu Cheng-Han
a8bce53c47 Fix viewAjaxCallback not able to be assigned 2016-10-29 23:33:58 +08:00
Wu Cheng-Han
3d6baa47ac Fix to hide duplicated MathML elements in static HTML exporting 2016-10-29 23:33:48 +08:00
Wu Cheng-Han
a563a15bab Fix generateCleanHTML not remove smoothhashscroll attribute properly 2016-10-29 23:33:16 +08:00
Wu Cheng-Han
dae141a9d3 Fix possible unclose HTML and leaked html tags when fail to parse diagrams 2016-10-26 01:30:17 +08:00
Wu Cheng-Han
b6ce7a6ab1 Update mathjax cdn path and source path 2016-10-25 01:57:51 +08:00
Wu Cheng-Han
15ca8cde2c Fix typos in the slide-example.md 2016-10-25 01:56:19 +08:00
Wu Cheng-Han
9e04f85229 Fix index select2 input padding and font-family to meet bootstrap input style 2016-10-25 01:56:06 +08:00
Wu Cheng-Han
f35a4167ec Fix conflicting bootstrap in index and add select2 in non-cdn resource 2016-10-23 23:39:42 +08:00
Wu Cheng-Han
0b9c177058 Update to move select2 dependency to bower and add its cdn sources 2016-10-23 23:00:42 +08:00
Wu Cheng-Han
e6dfc749f6 Fix config.js use cdn option not parse properly and add missing cdn resources 2016-10-23 22:42:47 +08:00
Wu Cheng-Han
0aa306685d Fix some typo of PR #230 2016-10-23 21:58:53 +08:00
Max Wu
7b85eb48cd Merge pull request #230 from PeterDaveHello/cdnjs+https+sri
Use CDNJS by default with https and SRI support
2016-10-23 21:47:11 +08:00
Wu Cheng-Han
a42845cfc0 Update to retry when anytime the socket io disconnect 2016-10-23 21:43:18 +08:00
Wu Cheng-Han
3db1214ecf Fix socket io doc event should setDoc when revision mismatch and no outstanding operation 2016-10-23 20:17:33 +08:00
Wu Cheng-Han
5ad7d61499 Fix passing markdown-it-emoji incorrect parameter type 2016-10-23 16:46:34 +08:00
Max Wu
5236e568e7 Merge pull request #229 from PeterDaveHello/patch-1
Update locale.js
2016-10-23 16:31:47 +08:00
Wu Cheng-Han
67786a8aab Fix code block syntax highlighting might not process properly because the HTML is escaped 2016-10-23 16:30:09 +08:00
Peter Dave Hello
58b2cff4ec Use CDNJS by default with https and SRI support 2016-10-23 13:31:25 +08:00
Peter Dave Hello
b039913506 Update locale.js
Should change the lang been selected in the lang select/option menu.
2016-10-23 11:38:17 +08:00
Wu Cheng-Han
27bc94744d Fix index.js isValidURL is not defined error 2016-10-22 15:48:28 +08:00
Wu Cheng-Han
d4bb87b8ec Fix ReferenceError of scollToTop and scollToBottom in index.js 2016-10-22 15:42:56 +08:00
Wu Cheng-Han
1b36cefd4b Update html.min.css for export html template 2016-10-21 23:40:33 +08:00
Wu Cheng-Han
250b462249 Fix markdown styles conflicting bootstrap on p and ul under alert area 2016-10-21 18:15:28 +08:00
Wu Cheng-Han
215b5baa9f Update to support Swedish locale 2016-10-21 13:39:28 +08:00
Wu Cheng-Han
894a7fc8e5 Fix gapi not able to reference callback function onGoogleClientLoaded 2016-10-20 12:22:59 +08:00
Wu Cheng-Han
7ebc84bec0 Try to remove unused front-end dependency 2016-10-19 22:14:32 +08:00
Wu Cheng-Han
d70d0318e5 Fix to use bower version emojify.js 2016-10-19 22:12:12 +08:00
Wu Cheng-Han
5640de8c77 Update to make history not depends on extra 2016-10-19 22:10:33 +08:00
Wu Cheng-Han
866c10d942 Update to make pretty use same method as slide to unescape markdown content 2016-10-19 22:09:15 +08:00
Wu Cheng-Han
f346e179ed Fix index social-foot styles 2016-10-19 22:08:27 +08:00
Wu Cheng-Han
7d79e7762f Merge branch 'master' of https://github.com/jackycute/HackMD 2016-10-18 16:53:44 +08:00
Wu Cheng-Han
d44e830366 Update emoji parser using markdown-it-emoji instead of emojify to solve issue #217 2016-10-18 16:50:58 +08:00
Yukai Huang
d9f55e4984 Add missing tooltip script 2016-10-18 12:57:20 +08:00
Wu Cheng-Han
eb724b05a7 Optimize finishView selector performance by avoid using universal selector, fix finishView code indentation and remove empty line 2016-10-18 12:15:35 +08:00
Wu Cheng-Han
843f025cb5 Fix finishView mermaid might select and replace whole markdown-body issue 2016-10-18 12:14:17 +08:00
Wu Cheng-Han
e311a1f620 Fix code block which in deeper level will not be parsed issue 2016-10-18 00:14:50 +08:00
Wu Cheng-Han
e097622098 Change to raise socket io reconnection attempts and make editor only available after refresh event received 2016-10-17 18:11:28 +08:00
Wu Cheng-Han
70a52e2eae Remove auto linkify image since it might print out unwanted url and it can be achieved by reference syntax, issue #214 2016-10-17 18:03:26 +08:00
Wu Cheng-Han
fe912f73ec Fix code block highlighting html not escaped when no languages specified 2016-10-17 17:54:58 +08:00
Wu Cheng-Han
a181b3d11f Fix index style 2016-10-15 14:01:05 +08:00
Wu Cheng-Han
dbd7449740 Update to support Hindi locale 2016-10-14 22:52:54 +08:00
Wu Cheng-Han
9995cbfd32 Fix export html highlight style source is missing and should load emojify styles from CDN 2016-10-14 17:41:30 +08:00
Wu Cheng-Han
912063bee4 Fix client socket on delete event might not delete corresponding history record correctly 2016-10-14 17:39:52 +08:00
Wu Cheng-Han
211d25253e Update to support wrap syntax for code block 2016-10-14 17:35:35 +08:00
Yukai Huang
4c1109b70b Move gist-embed to CDN 2016-10-14 09:56:19 +08:00
Yukai Huang
3d1bc8a8cb Move list-pagination plugin to CDN 2016-10-14 09:25:45 +08:00
Yukai Huang
142b4c6771 Move highlight.js to CDN 2016-10-14 09:21:41 +08:00
Wu Cheng-Han
ef5524be91 Fix sync scroll not handle properly on area resize 2016-10-14 00:25:08 +08:00
Yukai Huang
e4515958cd Fix require ordering 2016-10-14 00:02:55 +08:00
Yukai Huang
b5f42807b9 Fix ownership display 2016-10-13 23:29:25 +08:00
Yukai Huang
2f05e445cc Remove uneccesasry serverurl exporting 2016-10-13 19:15:51 +08:00
Yukai Huang
47b113d9fe Add handlebars script tag 2016-10-13 16:45:52 +08:00
Yukai Huang
ae3e1b972b Fix spellcheck
* also fix spaces width
2016-10-13 16:41:20 +08:00
Yukai Huang
747502e694 Fix HTML exporting 2016-10-13 16:35:43 +08:00
Yukai Huang
d600364933 Fix history deletion 2016-10-13 16:25:38 +08:00
Yukai Huang
f4f2497d23 Expose parseMeta function 2016-10-13 15:59:22 +08:00
Yukai Huang
f678d9b814 Fix cheatsheet rendering
do not process help-modal markdown-body
2016-10-13 15:54:17 +08:00
Yukai Huang
bcb12b9ae7 Remove jquery-scrollspy dependency
scrollspy is bootstrap built-in plugin
2016-10-13 15:30:26 +08:00
Yukai Huang
440ad3506c Fix lastchangeui and moment timestamps 2016-10-13 15:13:03 +08:00
Yukai Huang
4713b4f2aa Fix syncscroll 2016-10-13 14:03:02 +08:00
Yukai Huang
83be3465cc Fix scrollspy 2016-10-13 13:59:34 +08:00
Yukai Huang
773c0ce39e Optimize common assets with CDN
* jquery
* lodash
* socket.io
* boostrap
2016-10-13 11:42:17 +08:00
Yukai Huang
43c9f68b9a Refactor webpack module 2016-10-13 08:56:56 +08:00
Yukai Huang
b90c26fe90 Config CDN for viz.js 2016-10-13 08:56:02 +08:00
Yukai Huang
2f11706dd2 Merge branch 'master' into webpack-frontend 2016-10-12 18:19:08 +08:00
Yukai Huang
d5d9607c17 Fix stylesheet ordering 2016-10-12 18:14:39 +08:00
Wu Cheng-Han
f3d4b55856 Fix getCaretPosition in text complete might get undefined position error 2016-10-12 17:50:01 +08:00
Wu Cheng-Han
12b7646f24 Fix to handle name or color might get undefined error 2016-10-12 17:48:28 +08:00
Yukai Huang
6b6b534866 Merge branch 'master' into webpack-frontend 2016-10-12 17:39:38 +08:00
Yukai Huang
0bf3c63622 Remove slide.ejs style tag 2016-10-12 17:37:21 +08:00
Yukai Huang
2cafe15e85 Enable production assets hash 2016-10-12 17:15:59 +08:00
Yukai Huang
91266f1cad Load more scripts using webpack 2016-10-12 17:03:47 +08:00
Yukai Huang
895bf98b03 Load custom markdown-it-regex plugin with script-loader 2016-10-12 14:37:32 +08:00
Yukai Huang
b73fcfc5c9 Revert 56c5378
viz.js still has problem with split chunk
2016-10-12 14:37:05 +08:00
Yukai Huang
02eef3f68a Load customized vendor script through script-loader 2016-10-12 13:18:29 +08:00
Wu Cheng-Han
f5d471106c Fix history list not parse and bind events properly on change pagination 2016-10-12 13:14:46 +08:00
Wu Cheng-Han
f4fe27e26c Update to make history refresh have better UX and keep the beginning and end of the pagination visible 2016-10-12 13:08:53 +08:00
Yukai Huang
4a6a69e7bc Fix module export 2016-10-11 21:22:05 +08:00
Yukai Huang
6e651c8108 Merge branch 'master' into webpack-frontend 2016-10-11 18:40:23 +08:00
Yukai Huang
21028c5773 Cleanup 2016-10-11 18:06:40 +08:00
Yukai Huang
4a6903c91b Revert customized markdown-it-mathjax plugin 2016-10-11 17:53:46 +08:00
Yukai Huang
56c5378939 Optimize viz.js async rendering through webpack chunk 2016-10-11 17:15:06 +08:00
Wu Cheng-Han
cd9f8fe36b Update to support pagination for history list 2016-10-11 16:48:42 +08:00
Wu Cheng-Han
c06b2f4838 Fix history time should save in UNIX timestamp to avoid time offset issue 2016-10-11 16:46:50 +08:00
Yukai Huang
d3315506dc Remove unused viz.js require 2016-10-11 15:45:14 +08:00
Yukai Huang
06437ccaa9 Manage more packages with npm and webpack 2016-10-11 14:52:45 +08:00
Yukai Huang
9c8752d452 Split common vendor javascript into chunks 2016-10-11 12:30:30 +08:00
Yukai Huang
7086a8c5e7 Fix common.js.example 2016-10-11 11:15:23 +08:00
Wu Cheng-Han
9a15cad42d Mark as 0.4.5 2016-10-11 11:01:05 +08:00
Wu Cheng-Han
795ea21191 Update CodeMirror to 5.19.0 and rename jade to pug 2016-10-10 21:15:29 +08:00
Wu Cheng-Han
fb5d7e4359 Update npm and bower dependencies with related patch 2016-10-10 21:14:28 +08:00
Wu Cheng-Han
e60ee6886d Cancel update history on page unload 2016-10-10 21:04:42 +08:00
Wu Cheng-Han
12d5ed43a7 Update to support delete note 2016-10-10 21:04:24 +08:00
Wu Cheng-Han
68457ed3a2 Update to make history delete and pin function call to new APIs 2016-10-10 21:00:07 +08:00
Wu Cheng-Han
7a46c9fc5c Fix some incorrect redirects 2016-10-10 20:57:17 +08:00
Wu Cheng-Han
36a1900ce3 Update to make note history count in server-side when user logged 2016-10-10 20:55:33 +08:00
Wu Cheng-Han
dc343978eb Fix get or set history on server ajax should not fallback to browser storage to avoid some internet edge cases 2016-10-10 20:50:01 +08:00
Wu Cheng-Han
b6e68b2d36 Fix saveHistoryToStorage not correctly fallback to cookie 2016-10-10 20:49:42 +08:00
Wu Cheng-Han
b54b3cbe69 Add more comments in the code and remove unused code file 2016-10-10 20:48:56 +08:00
Wu Cheng-Han
e4b40d11a2 Update to make editor mode setting to a default variable 2016-10-10 20:47:57 +08:00
Wu Cheng-Han
f6f469d0fe Update to use modified editor markdown mode to make mathjax expression display correctly 2016-10-10 20:47:06 +08:00
Wu Cheng-Han
550746b70e Update default indent to use spaces instead of tabs 2016-10-10 20:46:06 +08:00
Wu Cheng-Han
1d1eedce7e Improve syntax highlighting performance by moving it to finish view 2016-10-10 20:45:49 +08:00
Wu Cheng-Han
521f76f7ad Update to make OT error, client reconnect handling better and refactor client "doc" event 2016-10-10 20:44:45 +08:00
Wu Cheng-Han
c9f5cd49b0 Fix potential error 2016-10-10 20:42:40 +08:00
Wu Cheng-Han
73a8a6c32a Fix OT socket io reconnect should resend last operation 2016-10-10 20:39:02 +08:00
Wu Cheng-Han
7e7919ce86 Fix broken link id reference 2016-10-10 20:34:53 +08:00
Wu Cheng-Han
72d7ba0f31 Update to remind note max length limit on the status bar length div 2016-10-10 20:33:17 +08:00
Wu Cheng-Han
3175616573 Update to support showing owner on the infobar 2016-10-10 20:32:20 +08:00
Wu Cheng-Han
7a85d62b77 Remove unused code 2016-10-10 20:26:12 +08:00
Wu Cheng-Han
a5e6b5dd3b Update to support Ukrainian locale 2016-10-10 19:48:05 +08:00
Max Wu
a5c97b6c81 Merge pull request #196 from PeterDaveHelloKitchen/image-optimize
optimize png images using zopflipng
2016-10-10 17:10:19 +08:00
Wu Cheng-Han
4c9dc5fa1f Add support of Italian, Turkish, Russian, Dutch, Croatian, Polish locales 2016-10-10 16:29:40 +08:00
Wu Cheng-Han
bf4c6d021c Extract config.js from common.js to make client setting file clean and also make upgrade easier 2016-10-10 16:25:51 +08:00
Yukai Huang
20f2e27350 Cover page is now working 2016-10-10 10:14:17 +08:00
Yukai Huang
082178d535 Slide mode is now working 2016-10-10 08:25:35 +08:00
Yukai Huang
e10203b7e9 More function expose workaround for reveal-markdown.js 2016-10-10 08:24:58 +08:00
Yukai Huang
70c20aadda Remove redundant entry point 2016-10-10 07:58:42 +08:00
Peter Dave Hello
83ae4751f4 optimize png images using zopflipng 2016-10-10 00:53:54 +08:00
Yukai Huang
a258897884 Revert some bower assets 2016-10-09 21:43:41 +08:00
Yukai Huang
8f9afa42d5 Fix history and edit mode change 2016-10-09 21:35:24 +08:00
Yukai Huang
2ccaf71191 Update common.js.example 2016-10-09 21:34:40 +08:00
Yukai Huang
8a254ea4f1 Fix scrollToTop/Buttom in preview
workaround
2016-10-09 21:14:18 +08:00
Yukai Huang
53b5cbb893 Finish public note view js loading 2016-10-09 21:09:22 +08:00
Yukai Huang
5355da0960 Workaround for circular require 2016-10-09 21:08:33 +08:00
Yukai Huang
d0997ed0c1 Config TextExtract plugin and change build folder 2016-10-09 18:22:31 +08:00
Yukai Huang
28858288fb Fix more js errors 2016-10-09 17:55:07 +08:00
Yukai Huang
3e2905be13 Revert to customized codemirror 2016-10-09 17:54:51 +08:00
Yukai Huang
196d546f7e Fix pdfobject require 2016-10-09 10:51:39 +08:00
Yukai Huang
67d118782d Fix function export 2016-10-09 08:15:37 +08:00
Yukai Huang
7e6b9f776f Revert customized ot library and fix dependency 2016-10-09 08:15:23 +08:00
Yukai Huang
845e9342c5 Add highlight.js and prism styles 2016-10-09 07:54:52 +08:00
Yukai Huang
8e2b03cfd6 Config bootstrap with webpack 2016-10-08 23:04:19 +08:00
Yukai Huang
2b678c1f12 Make editor variable global 2016-10-08 23:03:33 +08:00
Yukai Huang
963a435ae1 Resolve dependency module requiring
* es5 style module exports
* remove script tag require
* webpack config ProvidePlugin

Note that this commit only fix JavaScript module loading runtime error.
2016-10-08 20:02:30 +08:00
Yukai Huang
0be342c44d Fix mutiple socket.on handling 2016-10-08 19:58:26 +08:00
Yukai Huang
ebee5a8d05 Use xss in script tag 2016-10-08 19:57:50 +08:00
Yukai Huang
8e11c19bed Move out script tag and use js instead 2016-10-08 08:13:40 +08:00
Yukai Huang
93f3664c88 Add missing vendor code hard to deal with 2016-10-08 08:13:40 +08:00
Yukai Huang
0e63fe1fa0 Create example config 2016-10-05 10:58:05 +08:00
Yukai Huang
ca59d86628 Remove config files from version control 2016-10-05 10:57:10 +08:00
Laura Kyle
c43f068f6c Change wording of placeholder text 2016-10-02 21:39:45 -04:00
Wu Cheng-Han
aaf32dc4bf Update to support Greek and Portuguese locales 2016-10-02 10:34:10 +08:00
Wu Cheng-Han
21afa2de14 Fix undefined variable typo 2016-09-18 17:05:55 +08:00
Wu Cheng-Han
9b5856fff0 Fix text complete extra tags for blockquote and referral shouldn't match after the target search and referral regex now need two spaces when after some text 2016-09-18 17:05:29 +08:00
Wu Cheng-Han
748957dc9e Update help modal cheatsheet font styles to make it more clear on spaces 2016-09-18 17:05:07 +08:00
Wu Cheng-Han
93ec43c3dc Fix revision viewer might not update after data init, try to use editor operation queue to enhance updateView performance 2016-09-18 17:04:33 +08:00
Wu Cheng-Han
a9d7d7438f Fix sequence-diagram-min.js.map for source file reference and source file not found error 2016-09-18 17:03:17 +08:00
Wu Cheng-Han
6a641ab2bb Fix text might get cutoff again for IE and Edge series 2016-09-18 16:51:48 +08:00
Wu Cheng-Han
38b1477736 Fix syncscroll.js and index.js have circular dependency cause Reference Errors 2016-09-18 16:51:19 +08:00
Wu Cheng-Han
b7200d7910 Fix the include order to avoid Reference Errors 2016-09-18 16:50:35 +08:00
Wu Cheng-Han
c2f0943b49 Fix bug that when window close will make ajax fail and cause cookies set to wrong state 2016-09-18 16:42:59 +08:00
Wu Cheng-Han
23008bc1e1 Update to support wiki markup syntax highlighting in view using prism 2016-09-18 16:42:27 +08:00
Wu Cheng-Han
42145e4019 Update to support tiddlywiki and mediawiki syntax highlighting in editor 2016-09-18 16:40:51 +08:00
Wu Cheng-Han
591134007c Update to support shortcuts which can add or delete symbol surround text 2016-09-18 16:35:24 +08:00
Wu Cheng-Han
f1c9874ed0 Update to support save mode to url and parse mode from url 2016-09-18 16:33:33 +08:00
Wu Cheng-Han
3840308ab6 Update edit and publish icon and change toggle icon to make it straightforward, and add shortcut key reminder in modes' title 2016-09-18 16:32:26 +08:00
Wu Cheng-Han
9d71adc05c Add support of shortcut keys for changeMode 2016-09-18 16:30:08 +08:00
Wu Cheng-Han
b708a72873 Fix the element selector in smoothHashScroll might contain special characters and cause the Syntax error 2016-09-18 16:28:07 +08:00
Wu Cheng-Han
c22791610c Fix scripts load order to prevent reference error, using query callback to prevent google api call before loaded 2016-09-18 16:27:21 +08:00
Wu Cheng-Han
4421c8ede7 Improve authorship markers update performance and use CodeMirror built-in operation queue to avoid making DOM busy 2016-09-18 16:22:50 +08:00
Wu Cheng-Han
4cc00c6c40 Update to support French, Deutsch, Japanese and Spanish locales 2016-09-16 22:29:13 +08:00
Pablo Guerrero
20fecf28f6 Update features.md 2016-09-11 23:19:05 +02:00
Pablo Guerrero
963bb7049f Update features.md 2016-09-09 23:44:20 +02:00
Pablo Guerrero
c639ed9487 Update features.md 2016-09-09 22:42:12 +02:00
Pablo Guerrero
7725f7e6ca Update features.md 2016-09-09 22:08:17 +02:00
Wu Cheng-Han
b9c59c454d Add support of i18n with related patches and support "en" and "zh" locales for now 2016-08-19 11:49:24 +08:00
Wu Cheng-Han
87f4d05e8e Update to use proper way to render view and fix upload image error should response with code 2016-08-19 11:31:23 +08:00
Wu Cheng-Han
058c35730b Update to hide scrollbar (but scrollable) in the slide mode 2016-08-15 11:30:12 +08:00
Wu Cheng-Han
29d198def9 Update slide ready and change event to improve performance 2016-08-15 11:28:48 +08:00
Wu Cheng-Han
8124d6f2d6 Update features.md with latest changes 2016-08-15 11:28:05 +08:00
Wu Cheng-Han
b4ad011dc1 Fix toc id naming to avoid overlap with user toc 2016-08-15 11:27:32 +08:00
Wu Cheng-Han
a013c9d3bc Update slide mode to show extra info and support url actions and support disqus via yaml-metadata 2016-08-15 11:25:27 +08:00
Wu Cheng-Han
e12fae6999 Fix header nav bar rwd detect element should use div tag or it might glitch the layout 2016-08-15 11:02:47 +08:00
Wu Cheng-Han
fddc2ab38b Fix textcomplete of extra tags for blockquote not match space character in the between 2016-08-15 11:02:11 +08:00
Wu Cheng-Han
93ff287799 Fix text-shadow for text antialiased might cause IE or Edge text cutoff 2016-08-15 11:01:00 +08:00
Wu Cheng-Han
ecd7218917 Update to support data uri in src attribute of image tag 2016-08-15 11:00:02 +08:00
Wu Cheng-Han
3bcb36b46c Improve index layout and UX with UI adjustments and better wording 2016-08-15 10:56:14 +08:00
Wu Cheng-Han
cf290e86e1 Update XSS policy to allow iframe and link with custom protocol 2016-08-14 18:32:22 +08:00
Wu Cheng-Han
f11cab7b45 Update slide font styles 2016-08-14 18:28:36 +08:00
Wu Cheng-Han
bc2663fc75 Fix typo line break in features.md 2016-08-14 18:28:00 +08:00
Wu Cheng-Han
152585f96b Update markdown styles, follow github styles and font family 2016-08-14 18:27:20 +08:00
Wu Cheng-Han
be81ee22ec Update slide mode, now respect all meta settings and update default styles 2016-08-14 15:02:05 +08:00
Wu Cheng-Han
e08152ed03 Update toc styles to make toc menu always accessible without scrolling 2016-08-14 11:24:04 +08:00
Wu Cheng-Han
9c89876263 Revert d85dd19816, which breaks slide preview layout 2016-08-14 11:21:45 +08:00
Wu Cheng-Han
f35aa94b41 Mark as 0.4.4 2016-08-02 17:17:33 +08:00
Wu Cheng-Han
67474aa1d4 Update realtime check and refresh event, compress data using LZString UTF16 to minimize network delay 2016-08-02 17:16:01 +08:00
Wu Cheng-Han
f49fc192f6 Workaround vim mode might overwrite copy keyMap on Windows 2016-08-02 10:54:50 +08:00
Wu Cheng-Han
4de73477b4 Fix TOC might not update after changeMode 2016-08-02 10:54:20 +08:00
Wu Cheng-Han
b6aa045997 Update to add expand and collapse toggle for TOC, keep showing second level TOC if there is only one first level TOC 2016-08-02 10:54:03 +08:00
Wu Cheng-Han
881e92b05a Update to make help modal and text complete hint using consistent reminder text 2016-08-01 16:00:37 +08:00
Wu Cheng-Han
46ccf2d0a3 Update docs for customize slides and new YAML metadata 2016-08-01 00:08:44 +08:00
Wu Cheng-Han
b367e110b6 Update to support slideOptions in the YAML metadata 2016-08-01 00:08:22 +08:00
Wu Cheng-Han
ac087f0e90 Update workaround for slide, need to trigger it in other thread via setTimeout 2016-07-30 21:07:48 +08:00
Wu Cheng-Han
d85dd19816 Update slide rendering to reduce DOM wrap and avoid duplicate rendering slides 2016-07-30 20:33:32 +08:00
Wu Cheng-Han
eab984deff Workaround slides, overview been cutoff and text became blurry in Firefox 47+ 2016-07-30 20:19:20 +08:00
Wu Cheng-Han
1490eafdd2 Update CodeMirror to version 5.17.1 2016-07-30 12:25:24 +08:00
Wu Cheng-Han
8fcde970ab Update bower dependencies and cdn version 2016-07-30 12:22:16 +08:00
Wu Cheng-Han
65cff038a3 Update bootstrap to 3.3.7 and jQuery to 3.1.0 with related patches 2016-07-30 12:19:42 +08:00
Wu Cheng-Han
3a5bda3067 Fix idle.js not change isAway property on onAway and onAwayBack events 2016-07-30 11:32:19 +08:00
Wu Cheng-Han
f69a5361cb Update to make random color more discrete 2016-07-30 11:31:29 +08:00
Wu Cheng-Han
a8c12d0d21 Update user color style in online user list to make it super obvious 2016-07-30 11:30:12 +08:00
Wu Cheng-Han
a14e7953b5 Add support of showing authorship in editor and adjust related styles 2016-07-30 11:28:24 +08:00
Wu Cheng-Han
23c53f3d15 Update to support slide type in publish note and download html style 2016-07-30 11:07:47 +08:00
Wu Cheng-Han
8791447ef9 Update to support slide preview in both mode 2016-07-30 11:07:08 +08:00
Wu Cheng-Han
246c9da574 Fix spellcheck settings from cookies might not a boolean in string type 2016-07-30 11:00:00 +08:00
Wu Cheng-Han
b8ff9112ef Fix cookies might not in boolean type cause page refresh loop 2016-07-30 10:59:51 +08:00
Wu Cheng-Han
423dccae0e Update spell checker to ignore non-english or numeric alphabets 2016-07-13 10:43:19 +08:00
Wu Cheng-Han
cb75424f8e Update gist-embed to 2.5 and using bower to manage it 2016-07-13 10:40:34 +08:00
Wu Cheng-Han
3c7d39c52d Fix missing parameter in slide.js 2016-07-02 17:08:55 +08:00
Wu Cheng-Han
9e365b7c12 Update header toolbar menu to remove beta section and add extra section 2016-07-02 16:18:10 +08:00
Wu Cheng-Han
e8f59c1df8 Update to add viewAjaxCallback on every parts that use ajax loading 2016-07-02 16:16:22 +08:00
Wu Cheng-Han
4734d0ebe1 Add callback feature for gist-embed to be called after ajax complete 2016-07-02 16:15:56 +08:00
Wu Cheng-Han
da7b6a340d Reduce realtime timeout and heartbeat interval to handle stale clients quicker 2016-07-02 16:15:05 +08:00
Wu Cheng-Han
1df5b4ce49 Fix retryOnDisconnect and timer not clean up after reconnected 2016-07-02 16:13:34 +08:00
Wu Cheng-Han
a7773be949 Remove unsupported part of yaml-metadata in docs 2016-07-02 16:12:05 +08:00
Wu Cheng-Han
d39f1fc700 Update to make slide mode support all extra syntax and change it's rendering engine 2016-07-02 16:09:26 +08:00
Wu Cheng-Han
160b51d16a Update to prevent mermaid start on load 2016-07-02 16:03:00 +08:00
Wu Cheng-Han
af576bd31f Add new high resolution icon 2016-07-02 15:57:46 +08:00
Wu Cheng-Han
d7d83c102b Mark as 0.4.3 2016-06-28 09:38:31 +08:00
Cheng-Han, Wu
357ad0b535 Fix history filter tags and search keyword might not apply after refresh 2016-06-26 23:38:28 +08:00
Cheng-Han, Wu
83d8142045 Update to extend login info cookies to 365 days to reduce reductant page refresh 2016-06-26 23:37:59 +08:00
Cheng-Han, Wu
65b91e0b66 Update to handle on view have smaller scrollHeight than editor's shouldn't syncScrollToView after changes 2016-06-21 21:48:02 +08:00
Cheng-Han, Wu
3454819522 Update to annotate scrollbar position of revision mark text 2016-06-21 21:47:11 +08:00
Cheng-Han, Wu
f1db5c96f3 Fix to remove part class in list item or it will be included in buildMap process 2016-06-21 21:46:27 +08:00
Cheng-Han, Wu
f454994daa Fix features.md externals protocol and typo 2016-06-21 21:46:14 +08:00
Cheng-Han, Wu
09fb120967 Update to support toggle editor theme and spellcheck in status bar 2016-06-21 21:45:45 +08:00
Cheng-Han, Wu
6577313925 Remove metadata spellcheck support 2016-06-21 21:44:26 +08:00
Cheng-Han, Wu
3424cdd771 Add support of embed pdf 2016-06-21 21:44:06 +08:00
Cheng-Han, Wu
558304ff62 Update to support new metadata: title, description, tags and google-analytics (GA) and refactor render publish slide response function 2016-06-21 21:42:03 +08:00
Cheng-Han, Wu
ad6982e77e Remove robot meta on note edit page and html template, add prevent crawling header to enhance note privacy 2016-06-21 21:37:56 +08:00
Cheng-Han, Wu
949f26a0d1 Remove donation button in refresh modal 2016-06-17 16:52:00 +08:00
Cheng-Han, Wu
a6a107eab9 Update to remove data lines attributes in the patialUpdate to gain better performance 2016-06-17 16:33:01 +08:00
Cheng-Han, Wu
73f6d383b5 Add minimumCompatibleVersion and update refresh modal to show more detail informations 2016-06-17 16:31:36 +08:00
Cheng-Han, Wu
03e68f92eb Fix locked or private permission should block any operation if owner is null 2016-06-17 16:29:45 +08:00
Cheng-Han, Wu
a1198339db Update syncscroll throttle to gain better and smoother UX 2016-06-17 16:28:57 +08:00
Cheng-Han, Wu
3680988058 Update slide-example.md 2016-06-17 16:28:48 +08:00
Cheng-Han, Wu
71f61b7f84 Update all client dependencies and cdn versions, workaround sequence-diagram svg to be resizable 2016-06-17 16:27:37 +08:00
Cheng-Han, Wu
5d03109827 Update modal styles to fill larger screens 2016-06-17 16:19:16 +08:00
Cheng-Han, Wu
df68347d64 Update header dropdown class to make it scrollable on smaller viewport height 2016-06-17 16:18:01 +08:00
Cheng-Han, Wu
cb1e00d1d1 Add support of exporting raw html 2016-06-17 16:17:37 +08:00
Cheng-Han, Wu
4d24476316 Add revision modal with UIs and support to mark patch diff texts 2016-06-17 16:15:53 +08:00
Cheng-Han, Wu
56b4739e6d Add back missing support of image size in 0.4.2 2016-06-17 16:04:58 +08:00
Cheng-Han, Wu
d742b332eb Rearrange some code execute to make sure loaded is asset in correct position 2016-06-17 15:59:50 +08:00
Cheng-Han, Wu
a9fc8d0dff Update to bring up view rendering earlier on first loading 2016-06-17 15:59:25 +08:00
Cheng-Han, Wu
fe249c01f5 Fix updatePermission before loaded might cause duplicate view rendering 2016-06-17 15:58:51 +08:00
Cheng-Han, Wu
cca567453d Fix on paste long document to editor might cause scroll not syncing 2016-06-17 15:58:23 +08:00
Cheng-Han, Wu
2c58b05d05 Revert f32dee3796, because workaround has better performance and they might needed in some cases 2016-06-17 15:57:34 +08:00
Cheng-Han, Wu
3498b9fae9 Workaround CodeMirror won't draw selections outside of the viewport which will cause cursor related element blinking on scrolling 2016-06-17 15:55:51 +08:00
Cheng-Han, Wu
30c8420e30 Revert 85e00cb2ef, it's needed for checking if cursor related element reach the viewport edge 2016-06-17 15:55:27 +08:00
Cheng-Han, Wu
fb87de74a5 Update to make cursortag default as hover mode to prevent tag overlay other lines 2016-06-17 15:52:11 +08:00
Cheng-Han, Wu
2bff75a9f4 Update highlight.js to version 9.4.0 and use bower dependency 2016-06-04 10:50:53 +08:00
Cheng-Han, Wu
85e00cb2ef Remove doc top offset workaround for checkCursorTag and checkCursorMenu which cause cursors floating around 2016-06-04 10:49:53 +08:00
Cheng-Han, Wu
43ad625b82 Remove autoSyncscroll on updateView to avoid lost scroll position on other client editing 2016-06-04 10:49:30 +08:00
Cheng-Han, Wu
5c8df4a7a1 Fix to make socket keep retry after disconnect on server maintenance 2016-06-04 10:49:10 +08:00
Cheng-Han, Wu
dcc5ef2df6 Remove unnecessary editor refresh workaround because it already get fixed 2016-06-02 01:06:55 +08:00
Cheng-Han, Wu
223d685a7c Improve history clearDuplicatedHistory performance 2016-06-02 01:06:35 +08:00
Cheng-Han, Wu
b9060395ca Fix home button link broken in header template 2016-06-01 22:26:54 +08:00
Cheng-Han, Wu
c439797efd Mark as 0.4.2 2016-06-01 20:44:19 +08:00
Cheng-Han, Wu
ee3c6b5485 Fix in firefox other client's cursor might disappear or move out of bound 2016-06-01 14:38:59 +08:00
Cheng-Han, Wu
f32dee3796 Remove checkEditorScrollbar workaround since CodeMirror 5.15.3 already fixed this issue, refer to CodeMirror #3896 2016-06-01 14:37:51 +08:00
Cheng-Han, Wu
fb70833bc5 Update CodeMirror to version 5.15.3 2016-06-01 14:37:28 +08:00
Cheng-Han, Wu
16d5e3ea80 Add maintenance mode and update to gracefully exit process on signal 2016-06-01 14:18:54 +08:00
Cheng-Han, Wu
27e17d7772 Add release-notes as pure markdown file and remove old release notes section on index 2016-05-30 12:45:13 +08:00
Cheng-Han, Wu
da45b7dc10 Improve resize performance and fix resize syncscroll not accurate 2016-05-30 11:38:27 +08:00
Cheng-Han, Wu
16990e35a2 Update slide template using ejs instead of mustache to reduce similar package dependency 2016-05-29 17:54:24 +08:00
Cheng-Han, Wu
c73c32d127 Update to replace animation acceleration library from gsap to velocity 2016-05-29 17:49:29 +08:00
Cheng-Han, Wu
2c60f0dd67 Improve syncscroll performance and accuracy with few UX tweaks 2016-05-29 13:58:32 +08:00
Cheng-Han, Wu
20fbc9957f Update project title 2016-05-28 01:51:45 +08:00
Cheng-Han, Wu
e52937df50 Update project infos, reclaim authors and add authors list 2016-05-28 01:49:15 +08:00
Cheng-Han, Wu
5819e4007f Fix when scroll animate duration greater than debounce will cause scrolling flicking 2016-05-28 00:31:43 +08:00
Cheng-Han, Wu
5c861fd51e Update docs and textcomplete rules for image syntax with size specified 2016-05-27 13:39:54 +08:00
Cheng-Han, Wu
56840e784f Update textcomplete rules to support more conditions and fix hint typo 2016-05-27 13:38:59 +08:00
Cheng-Han, Wu
bce92d06df Fix help-modal cheatsheet typo 2016-05-27 13:37:58 +08:00
Cheng-Han, Wu
d90acf88e3 Update and fix editor might not sync scrolling from edit mode to both mode 2016-05-27 02:04:38 +08:00
Cheng-Han, Wu
e9b0ce8e04 Update to improve sync scroll to edit performance and fix sync scroll behavior on many situations 2016-05-27 00:12:07 +08:00
Cheng-Han, Wu
954137b760 Update resizable handle and sync scrolling toggle styles 2016-05-27 00:11:32 +08:00
Cheng-Han, Wu
b28750f256 Update to improve syncscroll performance and add toggle for sync scrolling 2016-05-26 13:17:00 +08:00
Cheng-Han, Wu
bf1dc237a9 Add support of sync scrolling to edit area 2016-05-25 13:25:05 +08:00
Cheng-Han, Wu
6405bb5056 Add support of google signin 2016-05-21 22:48:00 +08:00
Cheng-Han, Wu
97befb6238 Fix on paste or cut text might trigger syncscroll 2016-05-16 23:02:59 +08:00
Cheng-Han, Wu
eb5873a94d Update to move gitlab api path to sub path and fix its find user method for PR #121 2016-05-16 18:16:45 +08:00
Cheng-Han, Wu
5bb4423309 Fix to handle if last change user profile photo is null 2016-05-16 13:54:00 +08:00
Cheng-Han, Wu
c8560ec5fb Fix to handle if user avatar photo is null 2016-05-16 13:47:35 +08:00
Cheng-Han, Wu
438cedf882 Fix for help modal css style conflicts 2016-05-15 13:05:31 +08:00
Cheng-Han, Wu
9e75c5cdf4 Fix export snippet should check data before sending request and fix some code styles 2016-05-15 13:01:41 +08:00
Cheng-Han, Wu
aa34faf8ab Fix some code styles and user avatar style for PR #122 2016-05-15 12:31:16 +08:00
Cheng-Han, Wu
4058306d4e Add back missing code for 1f4e1f09b6 2016-05-15 12:30:28 +08:00
Max Wu
86b7304746 Merge pull request #122 from jccrofty30/avatar_on_history
Add avatar to History page.
2016-05-15 12:24:33 +08:00
Cheng-Han, Wu
1f4e1f09b6 Add some reminder for snippet before modal ajax 2016-05-15 12:22:51 +08:00
Cheng-Han, Wu
bdc3a29157 Fix signin template logic for PR #121 2016-05-15 12:22:07 +08:00
Cheng-Han, Wu
8a01b7242c Merge branch 'gitlab_snippets' of https://github.com/jccrofty30/hackmd into jccrofty30-gitlab_snippets
# Conflicts:
#	lib/response.js
2016-05-15 11:02:15 +08:00
Cheng-Han, Wu
73835763c6 Merge PR #118 2016-05-15 10:58:41 +08:00
Cheng-Han, Wu
a70ebf7762 Update to move dropbox app key setting to common.js and will auto load client-side related scripts 2016-05-15 10:54:24 +08:00
Cheng-Han, Wu
217e683422 Merge PR #101 2016-05-15 09:56:01 +08:00
Jason Croft
930afdc337 Show only projects where user is creator, has project access >= 20, or has group access. 2016-05-13 10:32:30 -04:00
Jason Croft
edcb766b63 Apply "snippets_enabled only" logic to import modal.
Better parsing for snippet import.
Add python filetype.
2016-05-13 10:00:34 -04:00
Jason Croft
c4b754e53b Add avatar to History page. 2016-05-12 15:21:05 -04:00
Jason Croft
ba0a8f584a Filter out projects that don't have snippets enabled. 2016-05-12 14:26:55 -04:00
Jason Croft
e65d43bd81 Merge remote-tracking branch 'origin/master' into gitlab_snippets
# Conflicts:
#	bower.json
#	public/views/body.ejs
2016-05-12 12:32:10 -04:00
Jason Croft
30e602a740 Enable snippet exporting. 2016-05-12 12:28:08 -04:00
Jason Croft
c16345ab12 Can now select from available projects and snippets to build import URL. 2016-05-12 11:19:14 -04:00
Jason Croft
de998c4a0f Check to make sure GitLab is configured before showing import option. 2016-05-11 21:12:48 -04:00
Jason Croft
a3876dfc92 Start extending to support GitLab authentication.
Add necessary dependency.
Add baseURL parameter for self-hosted GitLab
Add necessary require.
Add block for GitLab auth.
Fix typo
Update font-awesome dependency for GitLab icon.
Use a color closer to GitLab orange.
More direct TODO
2016-05-11 21:02:53 -04:00
Jason Croft
9f401b3fa8 Fully-fleshed snippetImportModal 2016-05-11 17:05:53 -04:00
Jason Croft
3dd3e6bc35 Allow importing from GitLab snippet 2016-05-11 17:05:25 -04:00
Cheng-Han, Wu
4aa4e3eacc Add help and help modal with contacts, documents, cheatsheet 2016-05-11 14:37:54 +08:00
Cheng-Han, Wu
79b37c4fb2 Update font-awesome to 4.6.2 2016-05-11 14:33:12 +08:00
Cheng-Han, Wu
a1cbdb6de7 Try to fix potential toolbar layout glitch 2016-05-11 11:47:39 +08:00
Jason Croft
70f6e5bc2c Define events for snippet actions 2016-05-09 22:38:13 -04:00
Jason Croft
17d2249ec3 Define snippet import modal 2016-05-09 22:37:51 -04:00
Jason Croft
476cabd109 Attach to snippet classes. 2016-05-09 17:07:02 -04:00
Jason Croft
277bf60a2e Add GitLab options. 2016-05-09 17:06:44 -04:00
Jason Croft
079822dfec Start extending to support GitLab authentication.
Add necessary dependency.
Add baseURL parameter for self-hosted GitLab
Add necessary require.
Add block for GitLab auth.
Fix typo
Update font-awesome dependency for GitLab icon.
Use a color closer to GitLab orange.
More direct TODO
2016-05-09 16:27:35 -04:00
Cheng-Han, Wu
8e8a5e1ecb Fix possible glitch of layout 2016-05-09 17:52:03 +08:00
Cheng-Han, Wu
7aa21c8f19 Fix missusing for CodeMirror.Pass 2016-04-28 11:10:09 +08:00
Cheng-Han, Wu
efb188c9c1 Fix code styles 2016-04-24 12:30:16 +08:00
Cheng-Han, Wu
0bb3e53d58 Change fullScreen toggle to F10
because Mac OS X default might overwrite F11 and F12 behaviors
2016-04-24 12:29:55 +08:00
Cheng-Han, Wu
b1187a2014 Fix some indentation 2016-04-24 11:03:57 +08:00
Cheng-Han, Wu
42ac80eb0e Fix other CodeMirror.Pass usage 2016-04-24 10:49:22 +08:00
Zankio
3aa9204e57 Fix Esc in Vim mode 2016-04-23 23:35:23 +08:00
Jannik Lorenz
55a1ba0699
Fix google drive config 2016-04-23 14:34:15 +02:00
Jannik Lorenz
d7648e9cea
Hide Dropbox and Google Drive in Import/ Export when disabled 2016-04-23 12:58:24 +02:00
Jannik Lorenz
fa50745a8d
Show Sign In button only when enabled 2016-04-23 01:15:52 +02:00
Cheng-Han, Wu
14c6778715 Fix home href link should specify root path 2016-04-22 10:43:30 +08:00
Cheng-Han, Wu
08de655c2b Update to support when client domain not provided will use window.location variable 2016-04-22 04:38:43 +08:00
Cheng-Han, Wu
f693399c76 Fix view scroll position might lost when editor changes the last line and might get wrong knob position 2016-04-20 22:34:52 +08:00
Cheng-Han, Wu
197ac5d5fb Mark as 0.4.0 2016-04-20 18:23:56 +08:00
Cheng-Han, Wu
b40bf3aef7 Update to support octicon and change header anchor styles 2016-04-20 18:22:18 +08:00
Cheng-Han, Wu
7e69bfc40b Merge client index.js settings to common.js 2016-04-20 18:20:43 +08:00
Cheng-Han, Wu
f6a995143d Update filter XSS to allow attr href starts with '.' or '/' 2016-04-20 18:18:52 +08:00
Cheng-Han, Wu
b823ed1d7c Fix that error page no need to load foot template 2016-04-20 18:17:09 +08:00
Cheng-Han, Wu
15b5252fcb Fix raphael source file name 2016-04-20 18:16:30 +08:00
Cheng-Han, Wu
8bf516263c Update CodeMirror to 5.13.5 2016-04-20 18:11:40 +08:00
Cheng-Han, Wu
edc3a31dfd Fix XSS HTML replace might get wrong on the HTML comments in the code tags 2016-04-20 18:10:43 +08:00
Cheng-Han, Wu
0fb70a1487 Support experimental spell checking feature (en-US only), can be enabled by the YAML meta option 2016-04-20 18:09:36 +08:00
Cheng-Han, Wu
692903f1a1 Support import from gist, fix some minor typo and issues 2016-04-20 18:06:36 +08:00
Cheng-Han, Wu
49b51e478f Refactor server with Sequelize ORM, refactor server configs, now will show note status (created or updated) and support docs (note alias) 2016-04-20 18:03:55 +08:00
Cheng-Han, Wu
e613aeba75 Updated to support ionicons 2016-04-20 16:28:18 +08:00
Cheng-Han, Wu
3f153515f4 Updated to support mermaid and moment use cdn source 2016-04-20 16:24:02 +08:00
Cheng-Han, Wu
b347ea5414 Workaround editor might have wrong doc height and wrong simple scroll bar knob position when editor height changed 2016-04-20 16:17:24 +08:00
Cheng-Han, Wu
b996f801cc Updated to add statusPanel variable 2016-04-20 16:16:46 +08:00
Cheng-Han, Wu
3718238277 Fixed editor changes will cause syncScrollToView 2016-04-20 16:16:07 +08:00
Cheng-Han, Wu
85078fd328 Fixed minor bugs 2016-03-16 12:46:29 +08:00
Cheng-Han, Wu
9b7c181808 Updated html.min.css 2016-03-15 11:13:20 +08:00
Cheng-Han, Wu
a55ece023a Improved checkCursorMenu and checkCursorTag performance and fully rewrite its position method for UX and verified 2016-03-15 11:12:45 +08:00
Cheng-Han, Wu
ea703145c5 Fixed editor should not try to programmatically focus on mobile without click, touch or mouse events 2016-03-15 11:10:58 +08:00
Cheng-Han, Wu
40f9206190 Fixed mobile layout issues and improved editor layout styles 2016-03-15 11:10:08 +08:00
Cheng-Han, Wu
b5d9d28f2e Updated to handle Mac shortcut keys of "Cmd-Left" and "Cmd-Right" 2016-03-15 11:05:05 +08:00
Cheng-Han, Wu
25dd400708 Improved overall textcomplete performance and more cases and UX handling 2016-03-15 11:04:45 +08:00
Cheng-Han, Wu
88e6e8522f Updated to support containers syntax textcomplete 2016-03-15 11:01:01 +08:00
Cheng-Han, Wu
e729166c32 Updated to support container syntax and styles 2016-03-15 10:56:53 +08:00
Cheng-Han, Wu
2a42fac6d4 Updated index wording and make features link and styles more obvious 2016-03-15 10:55:06 +08:00
Cheng-Han, Wu
218761d6a1 Updated to support mathjax without cdn 2016-03-15 10:53:45 +08:00
Cheng-Han, Wu
526f5c7e2e Improved update last info methods, only change DOM when necessary 2016-03-15 10:45:02 +08:00
Cheng-Han, Wu
921b5f4652 Manual patch CodeMirror for highlight only works on top item of the list issue 2016-03-04 23:31:51 +08:00
Cheng-Han, Wu
b49d4e2261 Support mermaid in code block diagram and updated all diagram rendering method and styles 2016-03-04 23:26:27 +08:00
Cheng-Han, Wu
c43f9784b4 Support YAML meta disable mathjax 2016-03-04 23:20:55 +08:00
Cheng-Han, Wu
109d9881d9 Fixed list_item_open rules of markdown-it rules in syncscoll should now check level number 2016-03-04 23:20:17 +08:00
Cheng-Han, Wu
ee5eddaff4 Changed all parsing exception console message type to warning 2016-03-04 23:19:49 +08:00
Cheng-Han, Wu
049eae5024 Fixed filter XSS should allow ordered list specify start number 2016-03-04 23:17:59 +08:00
Cheng-Han, Wu
845ef9bad6 Support export to and import from Google Drive 2016-03-04 23:17:35 +08:00
Cheng-Han, Wu
04eabff3c3 Fixed logout url not correct 2016-03-04 23:11:32 +08:00
Cheng-Han, Wu
1c859248e0 Updated to ignore process image which already wrapped by link node 2016-03-04 23:09:50 +08:00
Cheng-Han, Wu
8b16e0723d Added throttle for checkCursorMenu, gain much better input performance 2016-02-25 13:45:02 +08:00
Cheng-Han, Wu
fae3c02bb2 Fixed mathjax queue might parse whole page if pass an empty or single item array 2016-02-24 10:57:33 +08:00
Cheng-Han, Wu
daf4c9dcae Fixed mathjax might parse not specified elements and now pass array of elements 2016-02-24 10:35:52 +08:00
Cheng-Han, Wu
1da0b87714 Updated and fixed mathjax parsing, now using full featured plugin 2016-02-24 10:03:35 +08:00
Cheng-Han, Wu
c509abbc39 Support kbd tag 2016-02-22 22:42:40 +08:00
Cheng-Han, Wu
175f571a36 Fixed markdown-it include should use minified script 2016-02-22 11:18:55 +08:00
Cheng-Han, Wu
2dc2fbe162 Change markdown engine from remarkable to markdown-it 2016-02-22 08:58:06 +08:00
Cheng-Han, Wu
229740e478 Support mathjax option in YAML metadata 2016-02-21 11:36:44 +08:00
Cheng-Han, Wu
d97e435b3b Fixed when change widthInput value not parse correctly which cause tab indent problems 2016-02-18 03:38:09 +08:00
Cheng-Han, Wu
b2b1be3dda Support set url path and use relative url, move raphael to bower and fixed minor issue in history 2016-02-16 20:08:44 -08:00
Cheng-Han, Wu
db86dc7a48 Support textcomplete in multiple editing 2016-02-16 09:55:51 -06:00
Cheng-Han, Wu
1b059775e5 Fixed editor tab key not handle correctly on multiple lines selections 2016-02-16 09:54:33 -06:00
Cheng-Han, Wu
2501b190ab Updated to support html comment tag in XSS 2016-02-16 09:51:22 -06:00
Cheng-Han, Wu
26c40dca2d Fixed checkCursorTag element not valid 2016-02-15 19:16:48 -06:00
Cheng-Han, Wu
880f6bcf02 Updated to support lang attribute and styles in editor 2016-02-15 19:13:17 -06:00
Cheng-Han, Wu
6967dac0ff Updated syncscroll to lerp on last line 2016-02-11 14:36:05 -06:00
Cheng-Han, Wu
8db142554f Updated rendering operations to improve performance 2016-02-11 14:35:25 -06:00
Cheng-Han, Wu
2a774064af Updated XSS filter options to allow style tag and style attribute 2016-02-11 14:33:21 -06:00
Cheng-Han, Wu
4c4a0e0f3f Fixed prevent XSS might break lots of tags and only need after rendered 2016-02-11 03:45:13 -06:00
Cheng-Han, Wu
176021ccd8 Fixed cursor-tag and cursor-menu might not on correct position 2016-02-11 02:38:19 -06:00
Cheng-Han, Wu
6700f033ab Prevent XSS in markdown rendering 2016-02-11 02:36:52 -06:00
Cheng-Han, Wu
fdb9c47354 Fixed lz-string include path typo 2016-02-09 11:20:34 -06:00
Cheng-Han, Wu
0f811797f0 Fixed to keep index.css indent consistent 2016-02-08 23:07:55 -06:00
Cheng-Han, Wu
5aad217d34 Support change keymap and indentation type with size in statusbar 2016-02-08 22:51:07 -06:00
Cheng-Han, Wu
acb9dac1b9 Updated to make continue list in todo list default as unchecked 2016-02-08 22:49:35 -06:00
Cheng-Han, Wu
eb29e763a4 Removed ui-permission-label href attribute 2016-02-08 22:48:18 -06:00
Cheng-Han, Wu
740fde75d3 Manual patch CodeMirror for some minor issues 2016-02-02 13:56:30 -06:00
Cheng-Han, Wu
44ac1b295c Workaround for cut or paste action might make scrollMap not correct and big documents have poor input performance 2016-02-02 13:56:10 -06:00
Cheng-Han, Wu
ce8f9b695c Fixed isInCode and code block textcomplete might not correct 2016-02-01 00:42:30 -06:00
Cheng-Han, Wu
dcebc75d39 Updated to support ja, zh-TW, zh-CN font and removed non-latin font in all default styles to allow font fallbacks 2016-01-31 21:19:47 -06:00
Cheng-Han, Wu
ff2fc76491 Supported export to gist 2016-01-31 15:42:26 -06:00
Cheng-Han, Wu
3e48d46514 Moved dependency "flowchart" to bower and make it update-to-date 2016-01-31 15:35:17 -06:00
Cheng-Han, Wu
eba84527c3 Fixed only "AUTH failed" error message would redirect to 403 2016-01-31 15:33:25 -06:00
Cheng-Han, Wu
2eec0ae35d Improved code block and emojiy textcomplete and match rules 2016-01-31 15:32:35 -06:00
Cheng-Han, Wu
eb4cb3f52f Fixed supportCharts name not match real syntax 2016-01-31 15:30:10 -06:00
Cheng-Han, Wu
3c2a2a348b Fixed emojify should exclude parsing svg and catch its exception 2016-01-31 15:29:20 -06:00
Cheng-Han, Wu
ba4a7b13b3 Fixed a expression bug in postProcess 2016-01-31 15:28:52 -06:00
Cheng-Han, Wu
47668fe70a Fixed release notes typos 2016-01-31 15:28:35 -06:00
Cheng-Han, Wu
e473a4e61b Fixed cursor id not valid to selector 2016-01-22 19:48:07 -06:00
Cheng-Han, Wu
90710bc78b Manual patch remarkable for reductant character of code block in the blockquote 2016-01-22 19:47:26 -06:00
Cheng-Han, Wu
018beab583 Removed unused include 2016-01-21 01:16:53 -06:00
Cheng-Han, Wu
98a8640edb Removed unused include 2016-01-21 00:11:24 -06:00
Wu Cheng-Han
1b2a3108be Marked as 0.3.4 2016-01-19 10:06:22 -06:00
Wu Cheng-Han
7e5bdd0069 Updated copyright year to 2016 2016-01-19 10:05:55 -06:00
Wu Cheng-Han
75548df29e Added support of code block languages autocomplete for charts 2016-01-19 10:01:40 -06:00
Wu Cheng-Han
0dbde6d3d0 Manuel patch CodeMirror for markdown mode 2016-01-19 09:59:52 -06:00
Wu Cheng-Han
96931e6e3a Upgrade all dependencies and fixes afterward issues 2016-01-19 09:57:58 -06:00
Wu Cheng-Han
4073909b16 Added back todo list support in continuelist 2016-01-17 18:06:21 -06:00
Wu Cheng-Han
eaa8ccaccb Upgrade CodeMirror to 5.10.1 and now support fullscreen, jump-to-line in editor 2016-01-17 14:28:04 -06:00
Wu Cheng-Han
ce65e58096 Use minified version script 2016-01-17 11:54:58 -06:00
Wu Cheng-Han
bdc064fb79 Revert overwrite hardbreak rule because built-in rule is correct 2016-01-17 11:53:34 -06:00
Wu Cheng-Han
3fdceaaf06 Fixed history not update if note have no content and lz-string version mismatch 2016-01-17 09:59:03 -06:00
Wu Cheng-Han
762bf63581 Removed unused note and set empty on default note, updated features note 2016-01-17 09:57:25 -06:00
Wu Cheng-Han
eddff9e863 Added editor placeholder and auto set mode by content existence 2016-01-17 09:56:36 -06:00
Wu Cheng-Han
5c0a36f4d9 Updated external media layouts, too keep its ratio and enlarge to 100% width 2016-01-17 09:55:12 -06:00
Wu Cheng-Han
49c7dded45 Added private permission and clean up codes, solved potential race condition in realtime.js 2016-01-17 09:51:27 -06:00
Wu Cheng-Han
473212676a Fixed importFromUrl should parse by the file extension, and move to-markdown dependency to bower 2016-01-12 08:03:56 -06:00
Wu Cheng-Han
2ecec3b59a Support show last change user with profile and support YAML config inside the note with robots, lang, dir, breaks options 2016-01-12 08:01:42 -06:00