summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed inconsistencies in documentationYannick Bungers2020-11-121-12/+14
| | | | | | | | | - Updated Node.js requirement - Added warning for older Mysql and MariaDB versions - changed npm commands to yarn commands - changed occurrences of CodiMD to HedgeDoc for easier merging Signed-off-by: Yannick Bungers <git@innay.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
| * | Create yunohost.mdericgaspar2020-07-021-0/+8
| |/ | | | | | | | | | | Signed-off-by: ericgaspar <junk.eg@free.fr> Add setup doc about deploying CodiMD with YunoHost.
* | Merge pull request #437 from codimd/enhancement/lang-attr-publishedDavid Mehren2020-07-103-1/+3
|\ \
| * | Fixed meta parsing of lang-attribute for using it in the published-viewErik Michelson2020-07-042-1/+2
| | | | | | | | | | | | Signed-off-by: Erik Michelson <github@erik.michelson.eu>
| * | Added dynamic lang-attr to pretty.ejsErik Michelson2020-07-032-1/+2
| |/ | | | | | | | | | | CodiMD currently only uses the 'lang' attribute in YAML-metadata of a note for setting certain js-elements of the markdown-renderer. This commit adds the chosen lang into the published version of a note. Signed-off-by: Erik Michelson <github@erik.michelson.eu>
* | Merge pull request #439 from codimd/snyk-fix-8abe8148a4aed9acdfa517dfcae7bbd1David Mehren2020-07-102-1/+6
|\ \ | | | | | | [Snyk] Security upgrade lodash from 4.17.15 to 4.17.16
| * | fix: package.json & yarn.lock to reduce vulnerabilitiessnyk-bot2020-07-102-1/+6
|/ / | | | | | | | | The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-LODASH-567746
* | Merge pull request #432 from codimd/docs/fix-yamlDavid Mehren2020-07-021-1/+1
|\ \ | |/ |/| Fix yaml-metadata docs example for lang
| * Fixed yaml-metadata docsErik Michelson2020-07-021-1/+1
|/ | | | | | In the yaml-metadata docs, the example for the 'lang' attribute had an invalid key 'langs'. Signed-off-by: Erik Michelson <github@erik.michelson.eu>
* Upgrade LDAP-auth to fix RCE in ldapauth dependencySheogorath2020-06-271-40/+69
| | | | | | | | | | | | | | | Synk reported an Remote Code Execution vulnerability for the passport-ldapauth dependency `bunyan`. This RCE is due to wrong command sanitizing but doesn't only affects the executable the libary provides. It has no impact on CodiMD. This patch just updates passport-ldapauth since it's long overdue anyway and to silence annoying security scanners that pretend this is rather critical for us. Reference: https://github.com/trentm/node-bunyan/commit/ea21d75f548373f29bb772b15faeb83e87089746 https://app.snyk.io/vuln/SNYK-JS-BUNYAN-573166
* Merge pull request #423 from codimd/SuperSandro2000-patch-1Sheogorath2020-06-261-6/+6
|\ | | | | Fix browser logo links
| * Fix browser logo linksSandro2020-06-261-6/+6
|/ | | | Signed-off-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
* Merge pull request #419 from vberger/masterSheogorath2020-06-235-5/+10
|\ | | | | Backport of #278 for 1.6.1
| * Backport of #278 for 1.6.1Victor Berger2020-06-205-5/+10
|/ | | | | | | This is a backport of #278 with the default value of `scope` changed to `undefined`. This is thus a fully backward-compatible change. Signed-off-by: Victor Berger <victor.berger@m4x.org>
* Merge pull request #398 from gramakri/patch-1Sheogorath2020-06-201-1/+6
|\ | | | | Update Cloudron docs
| * Update Cloudron docsGirish Ramakrishnan2020-06-121-1/+6
| | | | | | | | | | | | Added a link to the demo and source code repo Signed-off-by: Girish Ramakrishnan <girish@cloudron.io>
* | Merge pull request #416 from oupala/patch-2Sheogorath2020-06-201-7/+6
|\ \ | | | | | | fix: outdated internal links in documentation
| * | fix: outdated internal links in documentationoupala2020-06-201-7/+6
|/ / | | | | | | Signed-off-by: oupala <oupala@users.noreply.github.com>
* | Merge pull request #414 from dalcde/configSheogorath2020-06-191-4/+4
|\ \ | | | | | | Fix docs/configuration formatting
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 22:53:51 +0000