summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #496 from codimd/fix/element-linksDavid Mehren2020-09-295-7/+7
|\
| * Change all element.io links to matrix.to linksErik Michelson2020-09-285-6/+6
| | | | | | | | Signed-off-by: Erik Michelson <github@erik.michelson.eu>
| * Update matrix chat link from riot.im to app.element.io and change room aliasErik Michelson2020-09-085-7/+7
| | | | | | | | Signed-off-by: Erik Michelson <github@erik.michelson.eu>
* | Merge pull request #497 from SISheogorath/translation/malayalamDavid Mehren2020-09-263-1/+132
|\ \ | | | | | | [1.x] Add Malayalam translation
| * | Add Malayalam translationSheogorath2020-09-093-1/+132
| |/ | | | | | | | | | | | | | | | | | | This patch adds the Malayalam translation to CodiMD. Do by our awesome translation supporters civic john, Sooraj Kenoth, Nithin Prabhakaran and Jothish. Thank you very much! Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #486 from codimd/feature/cookie-policyDavid Mehren2020-09-2513-26/+42
|\ \ | |/ |/|
| * Update documentation and messages to new default valueErik Michelson2020-09-082-2/+2
| | | | | | | | Signed-off-by: Erik Michelson <github@erik.michelson.eu>
| * Changed default policy from 'strict' to 'lax' due to the reasons mentioned ↵Erik Michelson2020-08-272-2/+2
| | | | | | | | | | | | in 3d1fab05 Signed-off-by: Erik Michelson <github@erik.michelson.eu>
| * Add config option for cookie SameSite policyErik Michelson2020-08-2713-26/+42
| | | | | | | | Signed-off-by: Erik Michelson <github@erik.michelson.eu>
* | Merge pull request #485 from codimd/fix/dropboxDavid Mehren2020-09-023-3/+23
|\ \
| * | Add test for dropbox csp ruleErik Michelson2020-08-231-0/+10
| | | | | | | | | | | | Signed-off-by: Erik Michelson <github@erik.michelson.eu>
| * | Added dropbox.appKey to test config to fix failing testsErik Michelson2020-08-231-1/+4
| | | | | | | | | | | | Signed-off-by: Erik Michelson <github@erik.michelson.eu>
| * | Add missing unsafe-inline CSP directiveErik Michelson2020-08-231-1/+1
| | | | | | | | | | | | | | | | | | Dropbox loads an external script that adds inline javascript. Therefore, this addition is needed when enabling dropbox support. Signed-off-by: Erik Michelson <github@erik.michelson.eu>
| * | Add prevent default to export button tooErik Michelson2020-08-231-1/+2
| | | | | | | | | | | | Signed-off-by: Erik Michelson <github@erik.michelson.eu>
| * | Add dropbox CSP directive if configured and make button clickableErik Michelson2020-08-232-1/+7
| |/ | | | | | | | | | | | | The lack of a 'preventDefault' on the click event handler resulted in the dropbox link being unclickable. Furthermore because of a missing CSP rule, the dropbox script couldn't be loaded. The dropbox origin is now added to the CSP script sources if dropbox integration is configured. Signed-off-by: Erik Michelson <github@erik.michelson.eu>
* | Merge pull request #490 from autra/backupsDavid Mehren2020-09-021-0/+10
|\ \ | |/ |/| Document the backup process
| * Document the backup processAugustin Trancart2020-09-021-0/+10
|/ | | | Signed-off-by: Augustin Trancart <augustin.trancart@oslandia.com>
* Merge pull request #469 from codimd/fix/update-webpackDavid Mehren2020-08-203-581/+1012
|\ | | | | Update Webpack dependencies
| * Update copy-webpack-plugin, css-loader, html-webpack-plugin, style-loader, ↵David Mehren2020-08-193-581/+1012
|/ | | | | | webpack and webpack-cli Signed-off-by: David Mehren <git@herrmehren.de>
* Merge pull request #468 from codimd/fix/moment-js-localeDavid Mehren2020-08-194-30/+45
|\ | | | | [1.x] Fix: Set moment.js locale to users' locale (#275)
| * Added translation keys for changed and createdErik Michelson2020-08-141-1/+3
| | | | | | | | Signed-off-by: Erik Michelson <github@erik.michelson.eu>
| * Made changed/created status translatableErik Michelson2020-08-132-5/+9
| | | | | | | | | | | | The current version of CodiMD/HedgeDoc does only support translations to be filled on server-side rendering. To allow the translation of the changed/created texts, I duplicated the container that holds the text, and pre-filed these containers with the translation server-side. The client just needs to hide the unneeded container and show the right one to show the translated status text. Signed-off-by: Erik Michelson <github@erik.michelson.eu>
| * Restructured locale.js to be included into the editor's js bundleErik Michelson2020-08-132-31/+34
| | | | | | | | | | | | Until now client-side translations were only possible in the context of the intro/history page, because the locale-detection logic relied on the language selector as a source of available languages. The editor of course has no such selector. With this commit, I copied the list of available languages from the i18n-initialization (server-side) to support language detection in the editor too. Signed-off-by: Erik Michelson <github@erik.michelson.eu>
| * Fixed setting moment.js locale to user-defined languageErik Michelson2020-08-132-1/+7
| | | | | | | | Signed-off-by: Erik Michelson <github@erik.michelson.eu>
* | Merge pull request #472 from codimd/snyk-fix-f5ec6425157c996c58d0d7c9e048da42David Mehren2020-08-192-5/+5
|\ \
| * | fix: package.json & yarn.lock to reduce vulnerabilitiessnyk-bot2020-08-172-5/+5
|/ / | | | | | | | | The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-LODASH-590103
* | Merge pull request #464 from oupala/masterDavid Mehren2020-08-131-147/+148
|\ \ | | | | | | feat: add default values to configuration documentation
| * | feat: add default values to configuration documentationoupala2020-08-041-147/+148
| |/ | | | | | | | | | | Add default values to configuration documentation when a default value is hard-coded. Specify **no default** otherwise. Signed-off-by: oupala <oupala@users.noreply.github.com>
* | Merge pull request #466 from codimd/snyk-fix-64ea86e30c3b96c444184cc52896fc7aDavid Mehren2020-08-132-5/+5
|\ \ | |/ |/| [Snyk] Security upgrade prismjs from 1.19.0 to 1.21.0
| * fix: package.json & yarn.lock to reduce vulnerabilitiessnyk-bot2020-08-102-5/+5
|/ | | | | The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-PRISMJS-597628
* Merge pull request #461 from SISheogorath/docs/add-renaming-noteDavid Mehren2020-07-301-0/+2
|\ | | | | Add note about renaming
| * Add note about renamingSheogorath2020-07-301-0/+2
| | | | | | | | | | | | | | | | | | To make it more obvious for people, a note in the README as recommended by danyork[1] seems like a good idea. [1]: https://github.com/danyork Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #462 from SISheogorath/docs/remove-hackmd-noteSheogorath2020-07-301-4/+0
|\ \ | |/ |/| Remove note about HackMD
| * Remove note about HackMDSheogorath2020-07-291-4/+0
|/ | | | | | | | The projects are going into completely different directions these days. Therefore I think it's no longer appropriated to have this note around. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #236 from quite/featuresDavid Mehren2020-07-121-4/+4
|\ | | | | Adjust features.md slightly after #232
| * Adjust features.md slightly after #232Daniel Lublin2020-07-121-4/+4
|/ | | | Signed-off-by: Daniel Lublin <daniel@lublin.se>
* Merge pull request #350 from n0emis/saml-client-certDavid Mehren2020-07-1118-14/+144
|\
| * saml: make logger print actual error messageSimeon Keske2020-07-111-2/+2
| | | | | | | | | | Signed-off-by: Simeon Keske <git@n0emis.eu> Signed-off-by: Leo Maroni <git@em0lar.de>
| * add error handling to saml-certsSimeon Keske2020-07-111-2/+15
| | | | | | | | | | Signed-off-by: Simeon Keske <git@n0emis.eu> Signed-off-by: Leo Maroni <git@em0lar.de>
| * Fixed Image Sources in saml-keycloak guideLeo Maroni2020-07-111-11/+11
| | | | | | | | Signed-off-by: Leo Maroni <git@em0lar.de>
| * Create Keycloak SAML guideLeo Maroni2020-07-1114-1/+114
| | | | | | | | | | | | Co-authored-by: Simeon Keske <git@n0emis.eu> Signed-off-by: Simeon Keske <git@n0emis.eu> Signed-off-by: Leo Maroni <git@em0lar.de>
| * allow to set a saml client certificateSimeon Keske2020-07-114-12/+16
|/ | | | Signed-off-by: Simeon Keske <git@n0emis.eu>
* Merge pull request #410 from oupala/feature/markdown-lintingDavid Mehren2020-07-1042-1379/+2690
|\
| * chore: update yarn.lockoupala2020-07-101-11/+1195
| | | | | | | | Signed-off-by: oupala <oupala@users.noreply.github.com>
| * style: linting markdown filesoupala2020-07-1038-1368/+1478
| | | | | | | | | | | | | | | | Linting markdown files according to default remark-lint configuration. Files inside the `public` directory were not linted. Signed-off-by: oupala <oupala@users.noreply.github.com>
| * fix: override markdown linting presetoupala2020-07-101-1/+5
| | | | | | | | | | | | Override markdown linting preset to disable a rule that seems useless and to change the default setting of 2 other rules. Signed-off-by: oupala <oupala@users.noreply.github.com>
| * chore: add markdown linter in travis CIoupala2020-07-021-0/+5
| | | | | | | | Signed-off-by: oupala <oupala@users.noreply.github.com>
| * feat: add remark-lint dependencies and scriptoupala2020-07-021-0/+3
| | | | | | | | | | | | Add remark-lint dependencies as dev dependencies, and an npm script alias to launch markdown linting with `npm run markdownlint`. Signed-off-by: oupala <oupala@users.noreply.github.com>
| * doc: add a markdown linting configuration fileoupala2020-07-021-0/+5
| | | | | | | | | | | | Add a markdown linting configuration file. The configuration file is using [remark-preset-lint-markdown-style-guide](https://github.com/remarkjs/remark-lint/tree/master/packages/remark-preset-lint-markdown-style-guide). This preset configure `remark-lint` with settings that the [Markdown Style Guide](http://www.cirosantilli.com/markdown-style-guide/) recommends. Signed-off-by: oupala <oupala@users.noreply.github.com>
* | Merge pull request #431 from ericgaspar/yunohost-setupDavid Mehren2020-07-101-0/+8
|\ \ | | | | | | Create yunohost.md