Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1004 from SISheogorath/feature/integrateHljs | Christoph (Sheogorath) Kern | 2018-10-11 | 1 | -1/+2 |
|\ | |||||
| * | Add autocomplete for highlight.js languages into codemirror | Sheogorath | 2018-10-10 | 1 | -1/+2 |
* | | Update yarn.lock | Sheogorath | 2018-10-11 | 1 | -16/+22 |
* | | Merge pull request #985 from SISheogorath/fix/helmetCSP | Christoph (Sheogorath) Kern | 2018-10-11 | 2 | -2/+2 |
|\ \ | |||||
| * | | Add `data:` URL to CSP and upgrade helmet | Sheogorath | 2018-10-04 | 2 | -2/+2 |
* | | | Merge pull request #989 from SISheogorath/remove/octicon | Christoph (Sheogorath) Kern | 2018-10-11 | 8 | -30/+23 |
|\ \ \ | |||||
| * | | | Remove dead package octicon | Sheogorath | 2018-10-10 | 8 | -30/+23 |
|/ / / | |||||
* | | | Merge pull request #1007 from davidmehren/webpack-4 | Christoph (Sheogorath) Kern | 2018-10-10 | 9 | -118/+99 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Update yarn.lock | David Mehren | 2018-10-10 | 1 | -0/+7 |
| * | | Add dev-docs for webpack. | David Mehren | 2018-10-10 | 1 | -0/+26 |
| * | | Use webpack-merge. | David Mehren | 2018-10-10 | 5 | -111/+59 |
| * | | Rename Webpack config to official recommendation | David Mehren | 2018-10-10 | 4 | -4/+4 |
|/ / | |||||
* | | Update yarn.lock | Sheogorath | 2018-10-09 | 1 | -5/+5 |
* | | Merge pull request #993 from SISheogorath/feature/useForkAwesome | Christoph (Sheogorath) Kern | 2018-10-09 | 7 | -10/+10 |
|\ \ | |||||
| * | | Replace font-awesome with fork-awesome | Sheogorath | 2018-10-05 | 7 | -10/+10 |
* | | | Merge pull request #990 from SISheogorath/fix/oauthProviderName | Christoph (Sheogorath) Kern | 2018-10-09 | 3 | -0/+3 |
|\ \ \ | |||||
| * | | | Make oauth2 provider name accessible | Sheogorath | 2018-10-04 | 3 | -0/+3 |
| |/ / | |||||
* | | | Merge pull request #1002 from micedre/fix-issue-1001 | Christoph (Sheogorath) Kern | 2018-10-09 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix #1001: get only project user is member of (and return max of results) | Cédric Couralet | 2018-10-09 | 1 | -1/+1 |
* | | | | Merge pull request #1000 from micedre/fix-issue-986 | Christoph (Sheogorath) Kern | 2018-10-09 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix #986 : Visibility is now transmitted with gitlab V4 api | Cédric Couralet | 2018-10-09 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #992 from SISheogorath/fix/maintainer | Christoph (Sheogorath) Kern | 2018-10-08 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | Update URL to codimd's own URL | Sheogorath | 2018-10-05 | 1 | -1/+1 |
| * | | | Add myself as maintainer | Sheogorath | 2018-10-05 | 1 | -0/+4 |
| |/ / | |||||
* | | | Merge pull request #994 from xf-/patch-1 | Christoph (Sheogorath) Kern | 2018-10-07 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update supported node.js version | Xaver Maierhofer | 2018-10-07 | 1 | -1/+1 |
|/ / / | |||||
* | | | Update yarn.lock | Sheogorath | 2018-10-06 | 1 | -5/+93 |
* | | | Merge pull request #942 from SISheogorath/feature/openID | Christoph (Sheogorath) Kern | 2018-10-06 | 8 | -4/+91 |
|\ \ \ | |||||
| * | | | Add OpenID to CodiMD | Sheogorath | 2018-10-05 | 8 | -4/+91 |
|/ / / | |||||
* | | | Merge pull request #940 from WilliButz/fix-configurable-paths | Christoph (Sheogorath) Kern | 2018-10-05 | 8 | -45/+39 |
|\ \ \ | |/ / |/| | | |||||
| * | | README: add note about configurable paths | WilliButz | 2018-09-27 | 1 | -13/+12 |
| * | | removing superfluous config parameters for template files | Claudius | 2018-09-26 | 5 | -22/+11 |
| * | | app.js: add missing routes for configurable paths | WilliButz | 2018-09-26 | 1 | -0/+3 |
| * | | imageRouter/filesystem: make callback path-independent | WilliButz | 2018-09-26 | 1 | -1/+2 |
| * | | lib/config: use `path.resolve` instead of `path.join` | WilliButz | 2018-09-26 | 1 | -14/+14 |
| * | | lib/config: add environment variable to set config file | WilliButz | 2018-09-26 | 1 | -1/+2 |
| * | | lib/models/revision.js: make independent of exec-path | WilliButz | 2018-09-26 | 1 | -1/+2 |
* | | | Merge pull request #982 from SISheogorath/feature/useNoOpener | Christoph (Sheogorath) Kern | 2018-10-04 | 5 | -13/+15 |
|\ \ \ | |||||
| * | | | Add rel="noopener" to target="_blank" links | Sheogorath | 2018-10-04 | 5 | -13/+15 |
| | |/ | |/| | |||||
* | | | Merge pull request #988 from ccoenen/oauth2-docs | Christoph (Sheogorath) Kern | 2018-10-04 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | details about OAuth2 in general. Fixes #930 | Claudius Coenen | 2018-10-04 | 1 | -0/+9 |
* | | | | Merge pull request #981 from SISheogorath/fix/devMode | Christoph (Sheogorath) Kern | 2018-10-04 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Add development mode for webpack in package.json | Sheogorath | 2018-10-03 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #987 from ccoenen/nextcloud-oauth2 | Christoph (Sheogorath) Kern | 2018-10-04 | 4 | -0/+52 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * / | How to use Nextcloud as OAuth2 Provider for CodiMD | Claudius Coenen | 2018-10-04 | 4 | -0/+52 |
|/ / | |||||
* | | Update yarn.lock | Sheogorath | 2018-10-03 | 1 | -4/+1598 |
* | | Merge pull request #974 from mcnesium/patch-1 | Christoph (Sheogorath) Kern | 2018-10-03 | 1 | -3/+3 |
|\ \ | |||||
| * | | fix image paths in moved GitLab auth guide | mcnesium | 2018-09-30 | 1 | -3/+3 |
* | | | Merge pull request #958 from SISheogorath/fix/uws | Christoph (Sheogorath) Kern | 2018-10-03 | 2 | -2/+6 |
|\ \ \ | |||||
| * | | | Replace `uws` with `ws` package | Sheogorath | 2018-09-18 | 2 | -2/+6 |