Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Fix ldap provider name in template | Sheogorath | 2018-01-26 | 2 | -1/+3 | |
| | | | | | | | | | | | | | | | | 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> | |||||
* | | Merge pull request #705 from SISheogorath/fix/camelcaseConfig | Christoph (Sheogorath) Kern | 2018-01-29 | 7 | -13/+21 | |
|\ \ | | | | | | | Remove camel case from `imageuploadtype` in config | |||||
| * | | Remove camel case from `imageuploadtype` in config | Sheogorath | 2018-01-27 | 7 | -13/+21 | |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | This removes the only camel cased option of the config options **we** added to the config.json. In auth provider's config parts are a lot of camel cased options provided. We shouldn't touch them to keep them as similar as possible to the examples. Fixes #315 Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | |||||
* | | Merge pull request #710 from hackmdio/feature/upgradeRevealJS | Christoph (Sheogorath) Kern | 2018-01-29 | 2 | -6/+5 | |
|\ \ | | | | | | | Upgrade reveal.js to 3.6.0 and useCDN option for CSS include | |||||
| * | | Upgrade reveal.js to 3.6.0 and useCDN option for CSS include | Wu Cheng-Han | 2018-01-29 | 2 | -6/+5 | |
|/ / | ||||||
* / | Add recommendation for 2GB RAM | Sheogorath | 2018-01-26 | 1 | -0/+1 | |
|/ | | | | | | | | | | We noticed on multiple places that machines with less than 2GB of RAM fail their build and result in missing files and unexpected errors. Sadly we can't really solve this right now since it's a webpack related bug. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | |||||
* | Extend README changes for minio | Sheogorath | 2018-01-26 | 1 | -3/+3 | |
| | ||||||
* | Merge pull request #698 from SISheogorath/docs/minio | Christoph (Sheogorath) Kern | 2018-01-26 | 8 | -1/+97 | |
|\ | | | | | Adding some docs for new Minio Feature | |||||
| * | Add README and `config.json.example` content | Sheogorath | 2018-01-23 | 2 | -1/+14 | |
| | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | |||||
| * | Add minio guide | Sheogorath | 2018-01-23 | 6 | -0/+83 | |
| | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | |||||
* | | Merge pull request #694 from SISheogorath/refactor/socialmedia | Christoph (Sheogorath) Kern | 2018-01-25 | 4 | -9/+12 | |
|\ \ | | | | | | | Reorganize social media links and footer | |||||
| * | | Reorganize social media links and footer | Sheogorath | 2018-01-24 | 4 | -9/+12 | |
| | | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | |||||
* | | | Update yarn.lock | Sheogorath | 2018-01-24 | 1 | -7/+50 | |
| | | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | |||||
* | | | Merge pull request #700 from hackmdio/fix-toggle-todo | Christoph (Sheogorath) Kern | 2018-01-24 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | Fix task todo might not toggle | |||||
| * | | | Fix task todo might not toggle | Max Wu | 2018-01-24 | 1 | -2/+2 | |
|/ / / | | | | | | | which caused by not matching syntax with double dashes correctly | |||||
* | | | Merge pull request #691 from SISheogorath/feature/upload | Christoph (Sheogorath) Kern | 2018-01-23 | 4 | -11/+29 | |
|\ \ \ | | | | | | | | | Allow more detailed configuration of upload mime types | |||||
| * | | | Allow more detailed configuration of upload mime types | Sheogorath | 2018-01-20 | 4 | -11/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #637 Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | |||||
* | | | | Merge pull request #697 from SISheogorath/fix/minio | Christoph (Sheogorath) Kern | 2018-01-23 | 1 | -1/+1 | |
|\ \ \ \ | |_|_|/ |/| | | | Fix broken port config | |||||
| * | | | Fix broken port config | Sheogorath | 2018-01-23 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | |||||
* | | | Merge pull request #506 from erasys/minio | Christoph (Sheogorath) Kern | 2018-01-23 | 4 | -0/+49 | |
|\ \ \ | | | | | | | | | Add support for minio | |||||
| * | | | Add support for minio | Marc Deop | 2017-08-30 | 4 | -0/+49 | |
| | | | | ||||||
* | | | | Merge pull request #598 from xxyy/feature/csp | Christoph (Sheogorath) Kern | 2018-01-22 | 12 | -15/+132 | |
|\ \ \ \ | |_|_|/ |/| | | | Implement basic CSP support | |||||
| * | | | Revert "Load js-url lib using legacy-loader" | Literallie | 2017-11-02 | 4 | -16/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Didn't work in Firefox for some reason. `[Script Loader] ReferenceError: module is not defined` This reverts commit 5b83deb043296c23ff912a2472703c1f7faddb4b. | |||||
| * | | | Fix MathJax config not being picked up | Literallie | 2017-10-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | thanks standard | |||||
| * | | | Move CSP logic to new file, Fix boolean config examples | Literallie | 2017-10-22 | 5 | -81/+91 | |
| | | | | | | | | | | | | | | | | Not sure why I was quoting these in the first place | |||||
| * | | | Add dirty workaround for speakers view inline script | Literallie | 2017-10-22 | 1 | -0/+4 | |
| | | | | ||||||
| * | | | Allow any connect-src in CSP | Literallie | 2017-10-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Managing these for all the integrations seems like a lot of effort | |||||
| * | | | Don't add nonce to CSP if unsafe-inline is on | Literallie | 2017-10-22 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | Browsers ignore unsafe-inline if a nonce is sent | |||||
| * | | | Change CSP config format to be more intuitive | Literallie | 2017-10-22 | 5 | -14/+48 | |
| | | | | ||||||
| * | | | Load js-url lib using legacy-loader | Literallie | 2017-10-22 | 4 | -7/+17 | |
| | | | | | | | | | | | | | | | | Doesn't use eval, plus no window object access | |||||
| * | | | CSP: Workaround for ws:// protocol | Literallie | 2017-10-22 | 1 | -2/+12 | |
| | | | | | | | | | | | | | | | | The spec allows wss:// for 'self', but not ws:// :( | |||||
| * | | | CSP: Allow more content types | Literallie | 2017-10-22 | 1 | -3/+7 | |
| | | | | ||||||
| * | | | Fix MathJax CSP issues | Literallie | 2017-10-22 | 5 | -16/+18 | |
| | | | | ||||||
| * | | | CSP: Add nonce to slide view inline JS | Literallie | 2017-10-22 | 4 | -2/+11 | |
| | | | | ||||||
| * | | | CSP: Upgrade insecure requests if possible | Literallie | 2017-10-22 | 2 | -2/+8 | |
| | | | | | | | | | | | | | | | | Config option; default is to only upgrade if usessl | |||||
| * | | | Add basic CSP support | Literallie | 2017-10-22 | 2 | -0/+35 | |
| | | | | ||||||
* | | | | Merge pull request #695 from SISheogorath/translate/chinese | Christoph (Sheogorath) Kern | 2018-01-22 | 2 | -2/+8 | |
|\ \ \ \ | | | | | | | | | | | Add some missing chinese translations | |||||
| * | | | | Add some chinese translations | Sheogorath | 2018-01-22 | 2 | -2/+8 | |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | |||||
* | | | | Merge pull request #673 from fooker/master | Christoph (Sheogorath) Kern | 2018-01-20 | 3 | -1/+13 | |
|\ \ \ \ | | | | | | | | | | | Allow posting new note with content | |||||
| * | | | | Allow posting new note with content | Dustin Frisch | 2018-01-18 | 3 | -1/+13 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dustin Frisch <fooker@lab.sh> | |||||
* | | | | | Merge pull request #688 from hackmdio/add-ce-text-on-index | Christoph (Sheogorath) Kern | 2018-01-20 | 1 | -0/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add CE text on index title | |||||
| * | | | | | Update body.ejs | Max Wu | 2018-01-20 | 1 | -0/+1 | |
| | |_|_|/ | |/| | | | | | | | | Add CE text on index title | |||||
* | | | | | Merge pull request #690 from Nebukadneza/add_allow_anonymous_edits | Christoph (Sheogorath) Kern | 2018-01-20 | 7 | -3/+9 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add option to enable `freely` permission in closed instance | |||||
| * | | | | | Add option to enable `freely` permission in closed instance | Dario Ernst | 2018-01-20 | 7 | -3/+9 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | |||||
* | | | | | Merge pull request #687 from SISheogorath/refactor/contact | Christoph (Sheogorath) Kern | 2018-01-20 | 6 | -14/+17 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove/update contact details | |||||
| * | | | | | Remove/update contact details | Sheogorath | 2018-01-20 | 6 | -14/+17 | |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | |||||
* | | | | | Merge pull request #693 from SISheogorath/translate/german | Christoph (Sheogorath) Kern | 2018-01-20 | 1 | -1/+4 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Extent german translation | |||||
| * | | | | Extent german translation | Sheogorath | 2018-01-20 | 1 | -1/+4 | |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | |||||
* | | | | Release 1.0.1-ce | Sheogorath | 2018-01-19 | 2 | -1/+15 | |
| | | | | ||||||
* | | | | Merge pull request #680 from hackmdio/show-ce-on-title | Christoph (Sheogorath) Kern | 2018-01-19 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Update README.md |