summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1017 from MartB/masterChristoph (Sheogorath) Kern2018-10-164-39/+48
|\
| * Fix #1016: webpack include defect for scripts and header files.MartB2018-10-164-39/+48
|/
* Update de.json (POEditor.com)Christoph (Sheogorath) Kern2018-10-150-0/+0
* Update pl.json (POEditor.com)Christoph (Sheogorath) Kern2018-10-121-103/+114
* Update fr.json (POEditor.com)Christoph (Sheogorath) Kern2018-10-121-103/+114
* Merge pull request #1004 from SISheogorath/feature/integrateHljsChristoph (Sheogorath) Kern2018-10-111-1/+2
|\
| * Add autocomplete for highlight.js languages into codemirrorSheogorath2018-10-101-1/+2
* | Update yarn.lockSheogorath2018-10-111-16/+22
* | Merge pull request #985 from SISheogorath/fix/helmetCSPChristoph (Sheogorath) Kern2018-10-112-2/+2
|\ \
| * | Add `data:` URL to CSP and upgrade helmetSheogorath2018-10-042-2/+2
* | | Merge pull request #989 from SISheogorath/remove/octiconChristoph (Sheogorath) Kern2018-10-118-30/+23
|\ \ \
| * | | Remove dead package octiconSheogorath2018-10-108-30/+23
|/ / /
* | | Merge pull request #1007 from davidmehren/webpack-4Christoph (Sheogorath) Kern2018-10-109-118/+99
|\ \ \ | |_|/ |/| |
| * | Update yarn.lockDavid Mehren2018-10-101-0/+7
| * | Add dev-docs for webpack.David Mehren2018-10-101-0/+26
| * | Use webpack-merge.David Mehren2018-10-105-111/+59
| * | Rename Webpack config to official recommendationDavid Mehren2018-10-104-4/+4
|/ /
* | Update yarn.lockSheogorath2018-10-091-5/+5
* | Merge pull request #993 from SISheogorath/feature/useForkAwesomeChristoph (Sheogorath) Kern2018-10-097-10/+10
|\ \
| * | Replace font-awesome with fork-awesomeSheogorath2018-10-057-10/+10
* | | Merge pull request #990 from SISheogorath/fix/oauthProviderNameChristoph (Sheogorath) Kern2018-10-093-0/+3
|\ \ \
| * | | Make oauth2 provider name accessibleSheogorath2018-10-043-0/+3
| |/ /
* | | Merge pull request #1002 from micedre/fix-issue-1001Christoph (Sheogorath) Kern2018-10-091-1/+1
|\ \ \
| * | | Fix #1001: get only project user is member of (and return max of results)Cédric Couralet2018-10-091-1/+1
* | | | Merge pull request #1000 from micedre/fix-issue-986Christoph (Sheogorath) Kern2018-10-091-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix #986 : Visibility is now transmitted with gitlab V4 apiCédric Couralet2018-10-091-1/+1
|/ / /
* | | Merge pull request #992 from SISheogorath/fix/maintainerChristoph (Sheogorath) Kern2018-10-081-1/+5
|\ \ \
| * | | Update URL to codimd's own URLSheogorath2018-10-051-1/+1
| * | | Add myself as maintainerSheogorath2018-10-051-0/+4
| |/ /
* | | Merge pull request #994 from xf-/patch-1Christoph (Sheogorath) Kern2018-10-071-1/+1
|\ \ \
| * | | Update supported node.js versionXaver Maierhofer2018-10-071-1/+1
|/ / /
* | | Update yarn.lockSheogorath2018-10-061-5/+93
* | | Merge pull request #942 from SISheogorath/feature/openIDChristoph (Sheogorath) Kern2018-10-068-4/+91
|\ \ \
| * | | Add OpenID to CodiMDSheogorath2018-10-058-4/+91
|/ / /
* | | Merge pull request #940 from WilliButz/fix-configurable-pathsChristoph (Sheogorath) Kern2018-10-058-45/+39
|\ \ \ | |/ / |/| |
| * | README: add note about configurable pathsWilliButz2018-09-271-13/+12
| * | removing superfluous config parameters for template filesClaudius2018-09-265-22/+11
| * | app.js: add missing routes for configurable pathsWilliButz2018-09-261-0/+3
| * | imageRouter/filesystem: make callback path-independentWilliButz2018-09-261-1/+2
| * | lib/config: use `path.resolve` instead of `path.join`WilliButz2018-09-261-14/+14
| * | lib/config: add environment variable to set config fileWilliButz2018-09-261-1/+2
| * | lib/models/revision.js: make independent of exec-pathWilliButz2018-09-261-1/+2
* | | Merge pull request #982 from SISheogorath/feature/useNoOpenerChristoph (Sheogorath) Kern2018-10-045-13/+15
|\ \ \
| * | | Add rel="noopener" to target="_blank" linksSheogorath2018-10-045-13/+15
| | |/ | |/|
* | | Merge pull request #988 from ccoenen/oauth2-docsChristoph (Sheogorath) Kern2018-10-041-0/+9
|\ \ \
| * | | details about OAuth2 in general. Fixes #930Claudius Coenen2018-10-041-0/+9
* | | | Merge pull request #981 from SISheogorath/fix/devModeChristoph (Sheogorath) Kern2018-10-041-1/+1
|\ \ \ \
| * | | | Add development mode for webpack in package.jsonSheogorath2018-10-031-1/+1
| | |/ / | |/| |
* | | | Merge pull request #987 from ccoenen/nextcloud-oauth2Christoph (Sheogorath) Kern2018-10-044-0/+52
|\ \ \ \ | |/ / / |/| / / | |/ /
| * / How to use Nextcloud as OAuth2 Provider for CodiMDClaudius Coenen2018-10-044-0/+52
|/ /