Commit graph

386 commits

Author SHA1 Message Date
Pedro Ferreira
40b3855702 Add support for generic OAuth2 providers
Signed-off-by: Pedro Ferreira <pedro.ferreira@cern.ch>
2018-03-26 15:55:39 +02:00
Sheogorath
2411dffa2c
Change config to camel case with backwards compatibility
This refactors the configs a bit to now use camel case everywhere.
This change should help to clean up the config interface and make it
better understandable.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
2018-03-25 19:08:14 +02:00
Sheogorath
a01b4a843c
Update socket.io to version 2.0.4
Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
2018-01-30 19:44:32 +01:00
Christoph (Sheogorath) Kern
adc781f7e3
Merge pull request #704 from SISheogorath/fix/ldapProviderName
Fix ldap provider name in template
2018-01-29 15:59:27 +01:00
Wu Cheng-Han
3c473e60a6 Upgrade reveal.js to 3.6.0 and useCDN option for CSS include 2018-01-29 13:09:52 +08:00
Sheogorath
e44751b3f1
Fix ldap provider name in template
Before this fix it's impossible to set the provider name in the
sign-model since `ldap` is a boolean there and this way not able
to have an attribute like `ldap.providerName`.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
2018-01-26 10:46:22 +01:00
Christoph (Sheogorath) Kern
e52d7db96c
Merge pull request #694 from SISheogorath/refactor/socialmedia
Reorganize social media links and footer
2018-01-25 17:40:11 +01:00
Sheogorath
16892cd827
Reorganize social media links and footer
Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
2018-01-24 14:09:36 +01:00
Christoph (Sheogorath) Kern
7de6e3211f
Merge pull request #598 from xxyy/feature/csp
Implement basic CSP support
2018-01-22 20:43:46 +01:00
Christoph (Sheogorath) Kern
5d9a2c3569
Merge pull request #688 from hackmdio/add-ce-text-on-index
Add CE text on index title
2018-01-20 18:56:39 +01:00
Christoph (Sheogorath) Kern
b7e227e9d5
Merge pull request #690 from Nebukadneza/add_allow_anonymous_edits
Add option to enable `freely` permission in closed instance
2018-01-20 18:56:09 +01:00
Sheogorath
dc10ec60fb
Remove/update contact details
Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
2018-01-20 17:40:00 +01:00
Dario Ernst
6ae4b8bf13 Add option to enable freely permission in closed instance
Before, closed disallowed guest edits completely, by removing
the `freely` permission. This makes it possible to explicitely bring
back guest-editing, but not guest-note-creation, to closed instances.

Signed-off-by: Dario Ernst <dario@kanojo.de>
2018-01-20 15:14:56 +01:00
Max Wu
05cc3a73a2
Update body.ejs
Add CE text on index title
2018-01-20 10:12:38 +08:00
Sheogorath
a0fdfccb22
It's 2018! 🎉 2018-01-19 14:08:16 +01:00
Edoardo Odorico
6fc2c39eda Implemented dark theme.
Signed-off-by: Edoardo Odorico <edoubuntu@gmail.com>
2018-01-05 00:15:13 +01:00
Christoph (Sheogorath) Kern
0957f5963b
Merge pull request #633 from nakaeeee/saml-auth
Support SAML authentication
2017-12-04 18:57:57 +01:00
Thomas De Backer
c60030b205 close open tags 2017-12-01 20:56:39 +01:00
Thomas De Backer
4eef4875ed Add untranslated sentences to locale 2017-11-30 19:02:40 +01:00
Norihito Nakae
4a4ae9d332 Initial support for SAML authentication 2017-11-28 18:52:24 +09:00
Sheogorath
16b3e015ab
Merge pull request #606 from DoubleMalt/feature/MattermostAuth
Add Mattermost authentication strategy
2017-10-31 12:11:41 +01:00
Christoph Witzany
5cda55086a Add mattermost authentication 2017-10-31 10:34:51 +01:00
Sheogorath
ef49b72442
Fix allowpdfexport handling on error page 2017-10-31 01:57:32 +01:00
Peter Dave Hello
f896432250 Upgrade mermaid to v7.1.0, fix #600 2017-10-30 00:18:53 +08:00
Sheogorath
abbc43f9b6 Merge pull request #599 from xxyy/fix/inline-styles
Externalise some trivial inline styles from slide.ejs
2017-10-27 13:24:26 +02:00
geekyd
d63e6780eb Adds PDF export via config 2017-10-25 19:19:37 +05:30
Literallie
af935e46fc
Externalise trivial inline styles from slide.ejs
Dynamic background images need some further work
2017-10-23 23:39:18 +02:00
Sheogorath
c794412714 Merge pull request #591 from Rwing/master
support Simplified Chinese and rename original zh to Traditional Chinese
2017-10-23 11:53:31 +02:00
Rwing
362a7eaf65 support Simplified Chinese and rename original zh to Traditional Chinese 2017-10-23 17:38:04 +08:00
Literallie
4238b9b3ef
Fix MathJax CSP issues 2017-10-22 00:03:45 +02:00
Literallie
080436aebb
CSP: Add nonce to slide view inline JS 2017-10-22 00:03:45 +02:00
geekyd
80fb91976e Hides empty export section 2017-10-18 03:34:45 +05:30
geekyd
c6a1b65a91 Adds color to new note button 2017-10-07 23:23:03 +05:30
Wu Cheng-Han
c8d3951d32 Add support of Danish locale 2017-06-11 15:52:04 +08:00
butlerx
e5834c077f
add the ability to set slide theme in slide options 2017-05-31 23:28:43 +01:00
Max Wu
f85d1d8801 Merge pull request #429 from hackmdio/refactor-part-3
Refactor frontend part 3
2017-05-13 19:54:43 +08:00
Wu Cheng-Han
be99350655 Fix to implement toggle of TOC in HTML template 2017-05-09 22:11:57 +08:00
Yukai Huang
db06a51299 Load statusbar template by string-loader 2017-05-07 20:37:26 +08:00
Max Wu
450159a462 Merge pull request #427 from PeterDaveHello/fix-indent
Fix indent in views, shouldn't mix tabs with spaces
2017-04-18 10:41:58 +08:00
Peter Dave Hello
5f3fe5c62c Fix indent in views, shouldn't mix tabs with spaces 2017-04-18 05:24:04 +08:00
Peter Dave Hello
08c0a0392c Use abcjs on cdnjs, cc @jackycute 2017-04-18 05:19:19 +08:00
Max Wu
5ecea7e118 Merge pull request #417 from hackmdio/refactor
Refactor editor cont.
2017-04-10 11:41:33 +08:00
Ian Dees
3aaf1bbe24 Update body.ejs 2017-04-05 11:07:18 -04:00
Ian Dees
138170704a Clarify permission language
See https://github.com/hackmdio/hackmd/issues/415
2017-04-05 10:16:15 -04:00
Yukai Huang
b86ecb1342 Extract selection update from updateStatusbar 2017-03-28 11:57:44 +08:00
Wu Cheng-Han
10a7a9b37e Update to use CDN css for emojify.js when applicable 2017-03-21 00:27:58 +08:00
Wu Cheng-Han
7989b89591 Add support of Catalan locale 2017-03-20 14:52:25 +08:00
Wu Cheng-Han
448b006194 Update to generate front-end constants on server startup
To avoid extra webpacking on changing configs and follow the 12 factor app
2017-03-20 01:39:09 +08:00
Wu Cheng-Han
506a381eca Add config option for gitlab api scope and auto adapt gitlab snippet feature on it 2017-03-14 18:04:23 +08:00
Wu Cheng-Han
6c87262bd9 Fix to use minified CDN file source in mermaid 2017-02-02 23:40:55 +08:00
Wu Cheng-Han
d5008b7aeb Update viz.js and mermaid CDN links 2017-02-02 23:37:20 +08:00
Wu Cheng-Han
fc00fa7434 Add link to features on profile dropdown 2017-01-21 14:24:51 +08:00
Wu Cheng-Han
a669c201be Fix template partial path 2017-01-21 14:04:54 +08:00
Wu Cheng-Han
09a7bcbdef Refactor templates and rearrange its path 2017-01-21 13:08:29 +08:00
Wu Cheng-Han
5e1d022e13 Add screenshot on index page 2017-01-21 12:52:26 +08:00
Wu Cheng-Han
53223b5e2c Update index layout to add profile on navbar 2017-01-16 12:06:04 +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
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
蒼時弦也
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
Wu Cheng-Han
ac2b100d35 Add back missing release-note link on index 2017-01-02 12:26:10 +08:00
Wu Cheng-Han
d74fea1d10 Update year to 2017 2017-01-02 11:14:25 +08:00
James Stephenson
ec1ae8c6b5 Added Esperanto translation
Translation by Jonathan Powell and James Stephenson
2016-12-30 22:02:57 -05:00
Florian Rhiem
fdea226159 Fixed typo: anonmyous 2016-12-21 14:36:54 +01:00
Wu Cheng-Han
276d500406 Upgrade dependencies 2016-12-19 16:20:27 +08:00
Wu Cheng-Han
5c7eb48319 Add support of allow anonymous config option with correspond modifications 2016-12-15 14:11:23 +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
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
4bd5598568 Fix Facebook page link name 2016-12-06 22:15:34 +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
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
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
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
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
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
0b45312834 Add font css to templates 2016-11-03 14:51:28 +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
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
b6ce7a6ab1 Update mathjax cdn path and source path 2016-10-25 01:57:51 +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
Peter Dave Hello
58b2cff4ec Use CDNJS by default with https and SRI support 2016-10-23 13:31:25 +08:00
Wu Cheng-Han
215b5baa9f Update to support Swedish locale 2016-10-21 13:39:28 +08:00
Wu Cheng-Han
d70d0318e5 Fix to use bower version emojify.js 2016-10-19 22:12:12 +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
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
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
Yukai Huang
47b113d9fe Add handlebars script tag 2016-10-13 16:45:52 +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
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
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
b90c26fe90 Config CDN for viz.js 2016-10-13 08:56:02 +08:00
Yukai Huang
d5d9607c17 Fix stylesheet ordering 2016-10-12 18:14:39 +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
02eef3f68a Load customized vendor script through script-loader 2016-10-12 13:18:29 +08:00
Yukai Huang
6e651c8108 Merge branch 'master' into webpack-frontend 2016-10-11 18:40:23 +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
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
Wu Cheng-Han
fb5d7e4359 Update npm and bower dependencies with related patch 2016-10-10 21:14:28 +08:00
Wu Cheng-Han
12d5ed43a7 Update to support delete note 2016-10-10 21:04:24 +08:00
Wu Cheng-Han
7e7919ce86 Fix broken link id reference 2016-10-10 20:34:53 +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
a5e6b5dd3b Update to support Ukrainian locale 2016-10-10 19:48:05 +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
70c20aadda Remove redundant entry point 2016-10-10 07:58:42 +08:00
Yukai Huang
a258897884 Revert some bower assets 2016-10-09 21:43:41 +08:00
Yukai Huang
53b5cbb893 Finish public note view js loading 2016-10-09 21:09:22 +08:00
Yukai Huang
d0997ed0c1 Config TextExtract plugin and change build folder 2016-10-09 18:22:31 +08:00
Yukai Huang
3e2905be13 Revert to customized codemirror 2016-10-09 17:54:51 +08:00