summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #271 from SuperSandro2000/patch-2Sheogorath2020-02-161-6/+6
|\ | | | | Replace dead browser icons and add missing
| * Replace dead browser icons and add missingSandro2020-02-161-6/+6
|/ | | | Signed-off-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
* Merge pull request #268 from stefandesu/patch-1Sheogorath2020-02-111-1/+1
|\ | | | | Adjust description of CMD_ALLOW_ANONYMOUS_EDITS
| * Adjust description of CMD_ALLOW_ANONYMOUS_EDITSStefan Peters2020-02-111-1/+1
|/ | | | | | `CMD_ALLOW_ANONYMOUS_EDITS` is only applied when `CMD_ALLOW_ANONYMOUS` is `false`, see [here](https://github.com/codimd/server/blob/9c1665ae5bf3cf38210ffd862d10de9b13bfacdd/lib/config/index.js#L71-L73). Signed-off-by: Stefan Peters <stefandesu@exo.pm>
* Merge pull request #267 from SISheogorath/fix/revisionLinksSheogorath2020-02-101-1/+1
|\ | | | | Fix revision redirect to index page
| * Fix revision redirect to index pageSheogorath2020-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The revision view had a bug that clicking on a list entry would redirect the user back to the index page instead of providing the revision diff. This was cased by the baseurl which is now used as reference for hrefs. Therefore when clicking on the `href="#"` this was actually pointing at `<baseurl>#` which is usually the index page. This patch simply removes the href from the list items and therefore the link functionality. This fixes the whole problem by removing 9 characters from our source code. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #264 from Belphemur/update-mermaidSheogorath2020-02-104-4/+4
|\ \ | |/ |/| Update mermaid
| * Update mermaid in CDNAntoine Aflalo2020-02-103-3/+3
| | | | | | | | Signed-off-by: Antoine Aflalo <antoine@warrantymaster.com>
| * Update mermaidAntoine Aflalo2020-02-101-1/+1
| | | | | | | | Signed-off-by: Antoine Aflalo <antoine@warrantymaster.com>
* | Merge pull request #266 from SISheogorath/feature/change-cdn-defaultsSheogorath2020-02-102-2/+2
|\ \ | |/ |/| Update CDN defaults
| * Update CDN defaultsSheogorath2020-02-092-2/+2
|/ | | | | | | | | | | | | | | | | | As we noticed in our poll about CDN usage, that most people intentionally turn it off, but very little intetionally turn it on or leave it on. [1] There is also strong indicators that CDNs don't really provide any benefits in loading time and due to the small deployments of CodiMD, there is no big savings due to CDNs either. [2] Therefore this patch changes the CDN default settings to off in order to reduce the exposed user data. [1]: https://community.codimd.org/t/poll-on-cdn-usage/28 [2]: https://csswizardry.com/2019/05/self-host-your-static-assets/ Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Update yarn.lockSheogorath2020-02-091-2024/+1854
| | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge branch 'google-oauth'Sheogorath2020-02-097-5/+13
|\ | | | | | | See https://github.com/codimd/server/pull/265
| * Update app.jsonike2020-02-081-0/+4
| | | | | | | | Signed-off-by: ike <developer@ikewat.com>
| * Add Google oauth variable: hostedDomainike2020-02-086-5/+9
|/ | | | | | | | Which is part of `passport-google-oauth2`. It could be used as whitelist to a domain supported by google oauth. Ref: https://github.com/jaredhanson/passport-google-oauth2/issues/3 Signed-off-by: ike <developer@ikewat.com>
* Update RevealJS to version 3.9.2Sheogorath2020-02-014-5/+3
| | | | | | | | | | | | This update of revealJS helps us to get rid of the headjs depedency integration using webpack. It updates reveal.js to 3.9.2 and updates the csp hash accordingly for using the slide mode. Background for this update is the critical security vulnerability described by snyk in their disclosure: https://snyk.io/vuln/SNYK-JS-REVEALJS-543841 Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #261 from ErikMichelson/fix/privacy-template-libravatarSheogorath2020-01-231-2/+2
|\ | | | | Changed Gravatar to Libravatar in privacy-template
| * Changed Gravatar to Libravatar in privacy-templateErik Michelson2020-01-231-2/+2
|/ | | | Signed-off-by: Erik Michelson <erik@liltv.de>
* Merge pull request #259 from Amolith/masterSheogorath2020-01-211-1/+1
|\ | | | | update env docs in reference to #247
| * update env docs in reference to #247Amolith2020-01-161-1/+1
| | | | | | | | Signed-off-by: Amolith <amolith@nixnet.xyz>
* | Merge pull request #250 from ErikMichelson/fix/signin-focusSheogorath2020-01-201-0/+14
|\ \ | |/ |/| Fix #249 - Focus user field after opening login modal
| * Fix #249 - Focus user field after opening login modalErik Michelson2020-01-081-0/+14
| | | | | | | | Signed-off-by: Erik Michelson <erik@liltv.de>
* | Merge pull request #257 from bluehood/fix_fonts_without_cdnSheogorath2020-01-152-27/+32
|\ \ | | | | | | Fix font loading when useCDN is false
| * | Fix font path when useCND is false and `urlPath` is usedEnrico Guiraud2020-01-151-26/+26
| | | | | | | | | | | | Signed-off-by: Enrico Guiraud <enrico.guiraud@cern.ch>
| * | Fix font paths when useCDN is false and no `urlPath` is presentEnrico Guiraud2020-01-151-1/+6
|/ / | | | | | | Signed-off-by: Enrico Guiraud <enrico.guiraud@cern.ch>
* | Merge pull request #248 from b10102016/patch-1Sheogorath2020-01-131-6/+6
|\ \ | | | | | | Update example config for gitlab authorization
| * | Update example config for gitlab authorizationIan Tsai2020-01-131-6/+6
| |/ | | | | | | | | | | Update example config for gitlab authorization Signed-off-by: Ian Tsai <b10102016@gmail.com>
* | Merge pull request #252 from ccoenen/masterClaudius Coenen2020-01-121-2/+1
|\ \ | |/ |/| heroku complains about dialect
| * heroku complains about dialectClaudius2020-01-111-2/+1
|/ | | | Signed-off-by: Claudius <opensource@amenthes.de>
* Merge pull request #235 from soerface/issue-234Sheogorath2019-12-281-4/+4
|\ | | | | Fix #234 - make manage_users work again
| * Check for falsy existing_user variable. Fixes #234Soeren Wegener2019-12-091-4/+4
| | | | | | | | | | | | | | Use another return code for "User already exist" This allows external scripts to differentiate between failure reasons. Signed-off-by: Soeren Wegener <wegener92@gmail.com>
* | Merge pull request #242 from bluehood/fix_urlpathSheogorath2019-12-289-6/+10
|\ \ | | | | | | Fix urlPath support, let CodiMD be served from a subpath correctly
| * | Fix urlPath support, let CodiMD be served from a subpath correctlyEnrico Guiraud2019-12-209-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | Webpack now uses relative paths for resources linked from by static snippets. A templated <base> tag has been introduced in headers so app.js can set the base URL at runtime. Signed-off-by: Enrico Guiraud <enrico.guiraud@cern.ch>
* | | Merge pull request #244 from savaroskij/masterSheogorath2019-12-282-2/+2
|\ \ \ | |/ / |/| | [DOC] Run `manage_users` with `NODE_ENV=production` set.
| * | [DOC] Run `manage_users` with `NODE_ENV=production` set.Matteo Savatteri2019-12-242-2/+2
|/ / | | | | | | | | | | `manage_user` script defaults to `development` environment. Signed-off-by: Matteo Savatteri <matteosavatteri@lcm.mi.infn.it>
* | Merge pull request #239 from bluehood/npm_not_yarnSheogorath2019-12-201-2/+2
|\ \ | | | | | | [DOC] Use `npm start`, not `yarn start` to start
| * | [DOC] Use `npm start`, not `yarn start` to startEnrico Guiraud2019-12-201-2/+2
|/ / | | | | | | | | | | | | `yarn start --production` ignores the `--production` flag, `npm start --production` does not. Signed-off-by: Enrico Guiraud <enrico.guiraud@cern.ch>
* | Merge pull request #243 from bluehood/docsSheogorath2019-12-201-5/+10
|\ \ | |/ |/| [DOC] Misc improvements to manual setup instructions
| * [DOC] Misc improvements to manual setup instructionsEnrico Guiraud2019-12-201-5/+10
|/ | | | Signed-off-by: Enrico Guiraud <enrico.guiraud@cern.ch>
* Merge pull request #218 from hoijui/linkifyHeaderStyleSheogorath2019-12-035-23/+86
|\ | | | | Linkify header style
| * make standard conform [fix]hoijui2019-10-301-8/+5
| | | | | | | | Signed-off-by: hoijui <hoijui.quaero@gmail.com>
| * make `headerIds` `const` [fix]hoijui2019-10-301-1/+1
| | | | | | | | Signed-off-by: hoijui <hoijui.quaero@gmail.com>
| * allow to define header link generation style via environment varhoijui2019-10-301-1/+2
| | | | | | | | Signed-off-by: hoijui <hoijui.quaero@gmail.com>
| * also use gfm header generation in test and debug configuraitonshoijui2019-10-301-2/+4
| | | | | | | | Signed-off-by: hoijui <hoijui.quaero@gmail.com>
| * fix gfm header link generation with respect to `deduplicatedHeaderId`hoijui2019-10-301-19/+69
| | | | | | | | Signed-off-by: hoijui <hoijui.quaero@gmail.com>
| * document `linkifyHeaderStyle` in default.jshoijui2019-10-301-0/+13
| | | | | | | | Signed-off-by: hoijui <hoijui.quaero@gmail.com>
| * linkifyHeaderStyle needs no string-ification; is already str.hoijui2019-10-301-1/+1
| | | | | | | | | | Co-Authored-By: Yukai Huang <yukaihuangtw@gmail.com> Signed-off-by: hoijui <hoijui.quaero@gmail.com>
* | Merge pull request #224 from davidmehren/webpack_updatesSheogorath2019-12-032-698/+671
|\ \ | | | | | | Upgrade webpack & plugins
| * | Upgrade webpack & pluginsDavid Mehren2019-11-232-698/+671
| | | | | | | | | | | | Signed-off-by: David Mehren <dmehren1@gmail.com>
* | | Merge pull request #227 from foobarable/fix/samlSheogorath2019-12-0313-28/+10
|\ \ \ | |/ / |/| | Fixing redirection after SAML login
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 01:04:03 +0000