summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1102 from hedgedoc/fix-saml-docsYannick Bungers2021-04-041-2/+2
|\ | | | | Fix emoji replacement in SAML docs
| * Fix emoji replacement in SAML docsTilman Vatteroth2021-04-041-2/+2
|/ | | | Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>
* Merge pull request #1091 from hedgedoc/improvement/add-hfm-docsDavid Mehren2021-04-032-0/+118
|\ | | | | [Docs] Add "HedgeDoc flavored markdown" page
| * [Docs] Add "HedgeDoc flavored markdown" pageTilman Vatteroth2021-04-012-0/+118
|/ | | | | Co-authored-by: Philip Molares <philip.molares@udo.edu> Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>
* Merge pull request #1075 from hedgedoc/fix/featuresTagsDavid Mehren2021-03-311-2/+9
|\ | | | | Features.md: Change tag explanation
| * Features.md: Change tag explanationPhilip Molares2021-03-281-2/+9
| | | | | | | | | | | | | | Explain tags in the features.md with yaml metadata, instead of the heading syntax. Signed-off-by: Philip Molares <philip.molares@udo.edu>
* | Merge pull request #1088 from hedgedoc/fix/remove-yahoo-cspDavid Mehren2021-03-311-1/+1
|\ \ | | | | | | CSP: Remove yahoo domain from defaults
| * | Remove yahoo domain from default CSP rulesErik Michelson2021-03-291-1/+1
|/ / | | | | | | Signed-off-by: Erik Michelson <opensource@erik.michelson.eu>
* | Merge pull request #1079 from hedgedoc/fix/mimeTypesYannick Bungers2021-03-294-12/+26
|\ \
| * | ImageUpload: Fix errors with .jpeg and .svgPhilip Molares2021-03-291-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | This checks all files that claim to be an svg (by their extension) that they really are and defines the typeFromMagic accordingly Files that got identified as jpg, but have the extension .jpeg get their extension fixed. The files extensions will work in all cases now. Signed-off-by: Philip Molares <philip.molares@udo.edu>
| * | Config: Remove image/jpgPhilip Molares2021-03-281-2/+0
| | | | | | | | | | | | | | | | | | This was done because both .jpg and .jpeg get the mime type 'image/jpeg' by FileType Signed-off-by: Philip Molares <philip.molares@udo.edu>
| * | Dependency: Add is-svgPhilip Molares2021-03-282-8/+9
| | | | | | | | | | | | | | | | | | This is used to check if .svg files really are svg. Signed-off-by: Philip Molares <philip.molares@udo.edu>
* | | Merge pull request #1084 from hedgedoc/fix/double-freeurl-note-creationYannick Bungers2021-03-292-2/+18
|\ \ \
| * | | Add better logging messagesErik Michelson2021-03-291-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Erik Michelson <opensource@erik.michelson.eu>
| * | | Check for existing notes on POST and dont override themErik Michelson2021-03-292-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | Previously one could override notes in FreeURL-mode by sending multiple POST requests to the /new/<alias> endpoint. This commit adds a check for an already existing note with the requested alias and returns a HTTP 409 Conflict error in case that happens. Signed-off-by: Erik Michelson <opensource@erik.michelson.eu>
* | | | Merge pull request #1085 from hedgedoc/renovate/master-mkdocs-material-7.xDavid Mehren2021-03-291-1/+1
|\ \ \ \ | | | | | | | | | | Update dependency mkdocs-material to v7.1.0 (master)
| * | | | Update dependency mkdocs-material to v7.1.0Renovate Bot2021-03-291-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Renovate Bot <bot@renovateapp.com>
* | | | Merge pull request #1080 from hedgedoc/renovate/master-lock-file-maintenanceDavid Mehren2021-03-291-58/+58
|\ \ \ \ | | | | | | | | | | Lock file maintenance (master)
| * | | | Lock file maintenanceRenovate Bot2021-03-291-58/+58
| |/ / / | | | | | | | | | | | | Signed-off-by: Renovate Bot <bot@renovateapp.com>
* | | | Merge pull request #1083 from hedgedoc/fix/unix_socket_cleanupDavid Mehren2021-03-291-1/+7
|\ \ \ \ | |/ / / |/| | | Properly clean up socket on exit
| * | | Properly clean up socket on exitDavid Mehren2021-03-291-1/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | `file.unlink` requires a callback, which we didn't set. This commit adds a callback with (error) logging, enabling HedgeDoc to properly clean up the socket. Closes #784 Signed-off-by: David Mehren <git@herrmehren.de>
* | | Merge pull request #1070 from hedgedoc/renovate/master-lintersDavid Mehren2021-03-282-5/+5
|\ \ \ | | | | | | | | Update dependency eslint to v7.23.0 (master)
| * | | Update dependency eslint to v7.23.0Renovate Bot2021-03-282-5/+5
|/ / / | | | | | | | | | Signed-off-by: Renovate Bot <bot@renovateapp.com>
* | | Merge pull request #1077 from hedgedoc/renovate/master-mkdocs-material-7.xDavid Mehren2021-03-281-1/+1
|\ \ \ | | | | | | | | Update dependency mkdocs-material to v7.0.7 (master)
| * | | Update dependency mkdocs-material to v7.0.7Renovate Bot2021-03-281-1/+1
| |/ / | | | | | | | | | Signed-off-by: Renovate Bot <bot@renovateapp.com>
* | | Merge pull request #1074 from hedgedoc/renovate/master-webpack-cli-4.xDavid Mehren2021-03-282-20/+20
|\ \ \ | | | | | | | | Update dependency webpack-cli to v4.6.0 (master)
| * | | Update dependency webpack-cli to v4.6.0Renovate Bot2021-03-272-20/+20
| |/ / | | | | | | | | | Signed-off-by: Renovate Bot <bot@renovateapp.com>
* | | Merge pull request #1069 from ↵David Mehren2021-03-282-5/+5
|\ \ \ | | | | | | | | | | | | | | | | hedgedoc/renovate/master-mini-css-extract-plugin-1.x Update dependency mini-css-extract-plugin to v1.4.0 (master)
| * | | Update dependency mini-css-extract-plugin to v1.4.0Renovate Bot2021-03-262-5/+5
| |/ / | | | | | | | | | Signed-off-by: Renovate Bot <bot@renovateapp.com>
* | | Merge pull request #1061 from hedgedoc/renovate/master-css-loader-5.xDavid Mehren2021-03-282-5/+5
|\ \ \ | |/ / |/| | Update dependency css-loader to v5.2.0 (master)
| * | Update dependency css-loader to v5.2.0Renovate Bot2021-03-252-5/+5
|/ / | | | | | | Signed-off-by: Renovate Bot <bot@renovateapp.com>
* | Merge pull request #1053 from hedgedoc/renovate/master-lock-file-maintenanceDavid Mehren2021-03-251-71/+73
|\ \ | |/ |/| Lock file maintenance (master)
| * Lock file maintenanceRenovate Bot2021-03-221-71/+73
|/ | | | Signed-off-by: Renovate Bot <bot@renovateapp.com>
* Merge pull request #1022 from hedgedoc/fix/translateDavid Mehren2021-03-185-9/+9
|\ | | | | [1.x] Templates: Remove lang and add translation parameter
| * Templates: Remove lang and add translation parameterPhilip Molares2021-03-165-9/+9
| | | | | | | | | | | | | | | | | | | | | | Since the interface is not always in english, we mostly removed the lang attribute from all html tags. Since the error messages in error.ejs are not translated, but always in english, there the global lang="en" should be kept. Also in the slide and editor template the div, which contains the user generated text, has the attribute translate="no" now, to avoid unwanted translations. Since on the publish view (pretty.ejs) only the user generated content is shown, we set the lang to the language defined in yaml (or 'en') as a default, but that was also moved to the corresponding markdown div instead of html. Fixes #881 See also #437 Signed-off-by: Philip Molares <philip.molares@udo.edu>
* | Merge pull request #1034 from hedgedoc/renovate/master-css-loader-5.xDavid Mehren2021-03-172-5/+5
|\ \ | | | | | | Update dependency css-loader to v5.1.3 (master)
| * | Update dependency css-loader to v5.1.3Renovate Bot2021-03-152-5/+5
|/ / | | | | | | Signed-off-by: Renovate Bot <bot@renovateapp.com>
* | Merge pull request #1025 from hedgedoc/1.x/replace-requestDavid Mehren2021-03-153-55/+64
|\ \ | | | | | | [1.x] Dependencies: Replace deprecated request library with node-fetch
| * | Replace request library with node-fetchErik Michelson2021-03-123-55/+64
| | | | | | | | | | | | Signed-off-by: Erik Michelson <github@erik.michelson.eu>
* | | Merge pull request #1013 from hedgedoc/renovate/master-lock-file-maintenanceDavid Mehren2021-03-151-38/+48
|\ \ \ | | | | | | | | Lock file maintenance (master)
| * | | Lock file maintenanceRenovate Bot2021-03-141-38/+48
|/ / / | | | | | | | | | Signed-off-by: Renovate Bot <bot@renovateapp.com>
* | | Merge pull request #1028 from hedgedoc/renovate/master-lintersDavid Mehren2021-03-142-8/+20
|\ \ \ | | | | | | | | Update dependency eslint to v7.22.0 (master)
| * | | Update dependency eslint to v7.22.0Renovate Bot2021-03-142-8/+20
|/ / / | | | | | | | | | Signed-off-by: Renovate Bot <bot@renovateapp.com>
* | | Merge pull request #1027 from hedgedoc/renovate/master-test-packagesDavid Mehren2021-03-142-5/+5
|\ \ \ | | | | | | | | Update dependency mocha to v8.3.2 (master)
| * | | Update dependency mocha to v8.3.2Renovate Bot2021-03-142-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Renovate Bot <bot@renovateapp.com>
* | | | Merge pull request #1020 from hedgedoc/renovate/master-css-loader-5.xDavid Mehren2021-03-142-10/+10
|\ \ \ \ | |/ / / |/| | | Update dependency css-loader to v5.1.2 (master)
| * | | Update dependency css-loader to v5.1.2Renovate Bot2021-03-142-10/+10
|/ / / | | | | | | | | | Signed-off-by: Renovate Bot <bot@renovateapp.com>
* | | Merge pull request #1029 from hedgedoc/renovate/master-mkdocs-material-7.xDavid Mehren2021-03-141-1/+1
|\ \ \ | |/ / |/| | Update dependency mkdocs-material to v7.0.6 (master)
| * | Update dependency mkdocs-material to v7.0.6Renovate Bot2021-03-141-1/+1
|/ / | | | | | | Signed-off-by: Renovate Bot <bot@renovateapp.com>
* | Merge pull request #976 from hedgedoc/renovate/master-lock-file-maintenanceDavid Mehren2021-03-071-195/+197
|\ \ | | | | | | Lock file maintenance (master)