summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #697 from SISheogorath/fix/minioChristoph (Sheogorath) Kern2018-01-231-1/+1
|\ | | | | Fix broken port config
| * Fix broken port configSheogorath2018-01-231-1/+1
|/ | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #506 from erasys/minioChristoph (Sheogorath) Kern2018-01-234-0/+49
|\ | | | | Add support for minio
| * Add support for minioMarc Deop2017-08-304-0/+49
| |
* | Merge pull request #598 from xxyy/feature/cspChristoph (Sheogorath) Kern2018-01-2212-15/+132
|\ \ | | | | | | Implement basic CSP support
| * | Revert "Load js-url lib using legacy-loader"Literallie2017-11-024-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 upLiterallie2017-10-221-1/+1
| | | | | | | | | | | | thanks standard
| * | Move CSP logic to new file, Fix boolean config examplesLiterallie2017-10-225-81/+91
| | | | | | | | | | | | Not sure why I was quoting these in the first place
| * | Add dirty workaround for speakers view inline scriptLiterallie2017-10-221-0/+4
| | |
| * | Allow any connect-src in CSPLiterallie2017-10-221-1/+1
| | | | | | | | | | | | Managing these for all the integrations seems like a lot of effort
| * | Don't add nonce to CSP if unsafe-inline is onLiterallie2017-10-221-1/+3
| | | | | | | | | | | | Browsers ignore unsafe-inline if a nonce is sent
| * | Change CSP config format to be more intuitiveLiterallie2017-10-225-14/+48
| | |
| * | Load js-url lib using legacy-loaderLiterallie2017-10-224-7/+17
| | | | | | | | | | | | Doesn't use eval, plus no window object access
| * | CSP: Workaround for ws:// protocolLiterallie2017-10-221-2/+12
| | | | | | | | | | | | The spec allows wss:// for 'self', but not ws:// :(
| * | CSP: Allow more content typesLiterallie2017-10-221-3/+7
| | |
| * | Fix MathJax CSP issuesLiterallie2017-10-225-16/+18
| | |
| * | CSP: Add nonce to slide view inline JSLiterallie2017-10-224-2/+11
| | |
| * | CSP: Upgrade insecure requests if possibleLiterallie2017-10-222-2/+8
| | | | | | | | | | | | Config option; default is to only upgrade if usessl
| * | Add basic CSP supportLiterallie2017-10-222-0/+35
| | |
* | | Merge pull request #695 from SISheogorath/translate/chineseChristoph (Sheogorath) Kern2018-01-222-2/+8
|\ \ \ | | | | | | | | Add some missing chinese translations
| * | | Add some chinese translationsSheogorath2018-01-222-2/+8
|/ / / | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #673 from fooker/masterChristoph (Sheogorath) Kern2018-01-203-1/+13
|\ \ \ | | | | | | | | Allow posting new note with content
| * | | Allow posting new note with contentDustin Frisch2018-01-183-1/+13
| | | | | | | | | | | | | | | | Signed-off-by: Dustin Frisch <fooker@lab.sh>
* | | | Merge pull request #688 from hackmdio/add-ce-text-on-indexChristoph (Sheogorath) Kern2018-01-201-0/+1
|\ \ \ \ | | | | | | | | | | Add CE text on index title
| * | | | Update body.ejsMax Wu2018-01-201-0/+1
| | | | | | | | | | | | | | | Add CE text on index title
* | | | | Merge pull request #690 from Nebukadneza/add_allow_anonymous_editsChristoph (Sheogorath) Kern2018-01-207-3/+9
|\ \ \ \ \ | | | | | | | | | | | | Add option to enable `freely` permission in closed instance
| * | | | | Add option to enable `freely` permission in closed instanceDario Ernst2018-01-207-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/contactChristoph (Sheogorath) Kern2018-01-206-14/+17
|\ \ \ \ \ | | | | | | | | | | | | Remove/update contact details
| * | | | | Remove/update contact detailsSheogorath2018-01-206-14/+17
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | | Merge pull request #693 from SISheogorath/translate/germanChristoph (Sheogorath) Kern2018-01-201-1/+4
|\ \ \ \ \ | |/ / / / |/| | | | Extent german translation
| * | | | Extent german translationSheogorath2018-01-201-1/+4
|/ / / / | | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Release 1.0.1-ceSheogorath2018-01-192-1/+15
| | | |
* | | | Merge pull request #680 from hackmdio/show-ce-on-titleChristoph (Sheogorath) Kern2018-01-191-1/+1
|\ \ \ \ | | | | | | | | | | Update README.md
| * | | | Update README.mdMax Wu2018-01-181-1/+1
| | | | | | | | | | | | | | | To show "Community Edition" on title.
* | | | | Merge pull request #686 from SISheogorath/feature/configVersionChristoph (Sheogorath) Kern2018-01-191-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Load version from package.json
| * | | | | Load version from package.jsonSheogorath2018-01-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | | | Merge pull request #684 from hackmdio/fixDropboxAppKeyChristoph (Sheogorath) Kern2018-01-194-4/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix not passing app key correctly in dropbox config ⚠️ Dropbox ClientSecret was leaked ⚠️ Fixes #683
| * | | | | | Fix not passing app key correctly in dropbox configWu Cheng-Han2018-01-194-4/+7
| |/ / / / /
* | | | | | Merge pull request #685 from hackmdio/fixImageAltChristoph (Sheogorath) Kern2018-01-191-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix image alt not render properly Fixes #638
| * | | | | | Fix image alt not render properlyWu Cheng-Han2018-01-191-1/+2
| |/ / / / /
* / / / / / It's 2018! :tada:Sheogorath2018-01-191-1/+1
|/ / / / /
* | | | | Release 1.0.0-ceSheogorath2018-01-183-3/+42
| | | | |
* | | | | Merge pull request #682 from SISheogorath/extend/gitignoreChristoph (Sheogorath) Kern2018-01-181-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add package-lock.json to .gitignore
| * | | | | Add package-lock.json to .gitignoreSheogorath2018-01-181-0/+1
| | | | | |
* | | | | | Merge pull request #681 from SISheogorath/fix/420Christoph (Sheogorath) Kern2018-01-181-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Ignore empty values for revision.
| * | | | | Ignore empty values for revision.Sheogorath2018-01-181-2/+2
|/ / / / / | | | | | | | | | | | | | | | Fixes #420
* | | | | Merge pull request #636 from laysdra7265/fix/sslcapathChristoph (Sheogorath) Kern2018-01-182-2/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix sslcapath bug
| * | | | | Update index.jsChristoph (Sheogorath) Kern2017-12-221-1/+1
| | | | | |
| * | | | | Simplify loopChristoph (Sheogorath) Kern2017-12-221-8/+3
| | | | | |
| * | | | | fixed sslcapath bugLaysDragon2017-12-052-2/+10
| | | | | |