summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ /
* | Update yarn.lockSheogorath2018-10-031-4/+1598
* | Merge pull request #974 from mcnesium/patch-1Christoph (Sheogorath) Kern2018-10-031-3/+3
|\ \
| * | fix image paths in moved GitLab auth guidemcnesium2018-09-301-3/+3
* | | Merge pull request #958 from SISheogorath/fix/uwsChristoph (Sheogorath) Kern2018-10-032-2/+6
|\ \ \
| * | | Replace `uws` with `ws` packageSheogorath2018-09-182-2/+6
* | | | Merge pull request #932 from davidmehren/webpack-4Christoph (Sheogorath) Kern2018-10-038-1797/+3480
|\ \ \ \
| * | | | Upgrade to Webpack 4 - development configDavid Mehren2018-09-061-7/+13
| * | | | Upgrade to Webpack 4 - remove baseUrl propertyDavid Mehren2018-09-061-2/+1
| * | | | Upgrade to Webpack 4 - clean dependenciesDavid Mehren2018-09-062-780/+819
| * | | | Upgrade to Webpack 4 - fix CSS import orderDavid Mehren2018-09-062-19/+36
| * | | | Upgrade to Webpack 4 - fix 'export as html' chunkDavid Mehren2018-09-061-5/+14
| * | | | Upgrade to Webpack 4 - first tryDavid Mehren2018-09-067-1410/+3023
* | | | | Merge pull request #968 from SISheogorath/docs/ldap-ADChristoph (Sheogorath) Kern2018-10-031-0/+42
|\ \ \ \ \
| * | | | | Add documentation for an LDAP setup against Active DirectorySheogorath2018-09-261-0/+42
* | | | | | Update version to 1.2.1Sheogorath2018-10-031-1/+1
* | | | | | Update release notes for 1.2.1Sheogorath2018-10-031-0/+49
* | | | | | Revert "Remove unused dependency"Sheogorath2018-10-031-0/+1
* | | | | | Merge pull request #979 from SISheogorath/fix/removeUnusedDependenciesChristoph (Sheogorath) Kern2018-10-031-1/+0
|\ \ \ \ \ \