summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #716 from stbuehler/fix-refererChristoph (Sheogorath) Kern2018-02-052-6/+17
|\
| * don't require referer to find note id in socket.io connections (fixes #623)Stefan Bühler2018-02-052-6/+17
|/
* Merge pull request #714 from SISheogorath/fix/uncaughtExceptionChristoph (Sheogorath) Kern2018-01-311-0/+5
|\
| * Fix uncaught exception for non-existent userSheogorath2018-01-301-0/+5
* | Update Heroku buttonSheogorath2018-01-311-2/+4
* | Update yarn.lockSheogorath2018-01-311-52/+96
* | Merge pull request #713 from SISheogorath/update/socketioChristoph (Sheogorath) Kern2018-01-302-3/+3
|\ \ | |/ |/|
| * Update socket.io to version 2.0.4Sheogorath2018-01-302-3/+3
|/
* Prevent "wrong type"-issueSheogorath2018-01-291-1/+1
* Update yarn.lockSheogorath2018-01-291-0/+4
* Merge pull request #707 from Nebukadneza/add_cmdline_usermanagerChristoph (Sheogorath) Kern2018-01-294-3/+94
|\
| * Make travis run shellcheck only on shellscriptsDario Ernst2018-01-291-1/+1
| * Add simple user-management tool for emailsignin …Dario Ernst2018-01-293-2/+93
* | Update badges in README.mdSheogorath2018-01-291-2/+2
|/
* Update yarn.lockSheogorath2018-01-291-3/+3
* Merge pull request #704 from SISheogorath/fix/ldapProviderNameChristoph (Sheogorath) Kern2018-01-292-1/+3
|\
| * Fix ldap provider name in templateSheogorath2018-01-262-1/+3
* | Merge pull request #705 from SISheogorath/fix/camelcaseConfigChristoph (Sheogorath) Kern2018-01-297-13/+21
|\ \
| * | Remove camel case from `imageuploadtype` in configSheogorath2018-01-277-13/+21
| |/
* | Merge pull request #710 from hackmdio/feature/upgradeRevealJSChristoph (Sheogorath) Kern2018-01-292-6/+5
|\ \
| * | Upgrade reveal.js to 3.6.0 and useCDN option for CSS includeWu Cheng-Han2018-01-292-6/+5
|/ /
* / Add recommendation for 2GB RAMSheogorath2018-01-261-0/+1
|/
* Extend README changes for minioSheogorath2018-01-261-3/+3
* Merge pull request #698 from SISheogorath/docs/minioChristoph (Sheogorath) Kern2018-01-268-1/+97
|\
| * Add README and `config.json.example` contentSheogorath2018-01-232-1/+14
| * Add minio guideSheogorath2018-01-236-0/+83
* | Merge pull request #694 from SISheogorath/refactor/socialmediaChristoph (Sheogorath) Kern2018-01-254-9/+12
|\ \
| * | Reorganize social media links and footerSheogorath2018-01-244-9/+12
* | | Update yarn.lockSheogorath2018-01-241-7/+50
* | | Merge pull request #700 from hackmdio/fix-toggle-todoChristoph (Sheogorath) Kern2018-01-241-2/+2
|\ \ \
| * | | Fix task todo might not toggleMax Wu2018-01-241-2/+2
|/ / /
* | | Merge pull request #691 from SISheogorath/feature/uploadChristoph (Sheogorath) Kern2018-01-234-11/+29
|\ \ \
| * | | Allow more detailed configuration of upload mime typesSheogorath2018-01-204-11/+29
* | | | Merge pull request #697 from SISheogorath/fix/minioChristoph (Sheogorath) Kern2018-01-231-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix broken port configSheogorath2018-01-231-1/+1
|/ / /
* | | Merge pull request #506 from erasys/minioChristoph (Sheogorath) Kern2018-01-234-0/+49
|\ \ \
| * | | Add support for minioMarc Deop2017-08-304-0/+49
* | | | Merge pull request #598 from xxyy/feature/cspChristoph (Sheogorath) Kern2018-01-2212-15/+132
|\ \ \ \ | |_|_|/ |/| | |
| * | | Revert "Load js-url lib using legacy-loader"Literallie2017-11-024-16/+7
| * | | Fix MathJax config not being picked upLiterallie2017-10-221-1/+1
| * | | Move CSP logic to new file, Fix boolean config examplesLiterallie2017-10-225-81/+91
| * | | Add dirty workaround for speakers view inline scriptLiterallie2017-10-221-0/+4
| * | | Allow any connect-src in CSPLiterallie2017-10-221-1/+1
| * | | Don't add nonce to CSP if unsafe-inline is onLiterallie2017-10-221-1/+3
| * | | Change CSP config format to be more intuitiveLiterallie2017-10-225-14/+48
| * | | Load js-url lib using legacy-loaderLiterallie2017-10-224-7/+17
| * | | CSP: Workaround for ws:// protocolLiterallie2017-10-221-2/+12
| * | | 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