summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #989 from SISheogorath/remove/octiconChristoph (Sheogorath) Kern2018-10-118-30/+23
|\ | | | | Remove dead package octicon
| * Remove dead package octiconSheogorath2018-10-108-30/+23
|/ | | | | | | | Octicon no longer provides its CSS classes and this way is useless in CodiMD. Replacing all used classes in the UI and remove it from build system. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #1007 from davidmehren/webpack-4Christoph (Sheogorath) Kern2018-10-109-118/+99
|\ | | | | Webpack 4 refactor & docs
| * Update yarn.lockDavid Mehren2018-10-101-0/+7
| | | | | | | | Signed-off-by: David Mehren <dmehren1@gmail.com>
| * Add dev-docs for webpack.David Mehren2018-10-101-0/+26
| | | | | | | | Signed-off-by: David Mehren <dmehren1@gmail.com>
| * Use webpack-merge.David Mehren2018-10-105-111/+59
| | | | | | | | | | | | | | | | Move html export config to own file. Delete unnecessary config options. Use cheap source maps. Signed-off-by: David Mehren <dmehren1@gmail.com>
| * Rename Webpack config to official recommendationDavid Mehren2018-10-104-4/+4
|/ | | | Signed-off-by: David Mehren <dmehren1@gmail.com>
* Update yarn.lockSheogorath2018-10-091-5/+5
| | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #993 from SISheogorath/feature/useForkAwesomeChristoph (Sheogorath) Kern2018-10-097-10/+10
|\ | | | | Replace font-awesome with fork-awesome
| * Replace font-awesome with fork-awesomeSheogorath2018-10-057-10/+10
| | | | | | | | | | | | | | | | | | | | This patch replaces font-awesome with its fork called fork-awesome. Besides the fact that the newer versions of font-awesome can't be shipped with distros like debian due to license issues, fork-awesome also provides more FOSS related icons and builds on top of version 4.7.x of font-awesome, which we used until this patch. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #990 from SISheogorath/fix/oauthProviderNameChristoph (Sheogorath) Kern2018-10-093-0/+3
|\ \ | | | | | | Make oauth2 provider name accessible
| * | Make oauth2 provider name accessibleSheogorath2018-10-043-0/+3
| |/ | | | | | | | | | | | | | | | | Right now the feature exists but is almost not usable since the only way to configure it is to know that it exists from reading the source code and add it to config.json. This patch provides all needed changes so it can be used by everyone including documentation. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | 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)
| * | Fix #1001: get only project user is member of (and return max of results)Cédric Couralet2018-10-091-1/+1
| | | | | | | | | | | | Signed-off-by: Cédric Couralet <cedric.couralet@gmail.com>
* | | Merge pull request #1000 from micedre/fix-issue-986Christoph (Sheogorath) Kern2018-10-091-1/+1
|\ \ \ | |/ / |/| | Fix #986 : Visibility is now transmitted with gitlab V4 api
| * | Fix #986 : Visibility is now transmitted with gitlab V4 apiCédric Couralet2018-10-091-1/+1
|/ / | | | | | | Signed-off-by: Cédric Couralet <cedric.couralet@gmail.com>
* | Merge pull request #992 from SISheogorath/fix/maintainerChristoph (Sheogorath) Kern2018-10-081-1/+5
|\ \ | | | | | | Fix maintainer and URL in package.json
| * | Update URL to codimd's own URLSheogorath2018-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | Since we have an own URL we should use it in here, since CodiMD and HackMD are really drifting away from each other. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * | Add myself as maintainerSheogorath2018-10-051-0/+4
| |/ | | | | | | | | | | | | | | Well, since I'm currently the maintainer of CodiMD, I should maybe mentioned in the package.json, just in case someone is willing to contact me about it. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #994 from xf-/patch-1Christoph (Sheogorath) Kern2018-10-071-1/+1
|\ \ | | | | | | Update supported node.js version
| * | Update supported node.js versionXaver Maierhofer2018-10-071-1/+1
|/ / | | | | | | | | | | Support includes v9.x, but no v10.x Signed-off-by: Xaver Maierhofer <xaver.maierhofer@xwissen.info>
* | Update yarn.lockSheogorath2018-10-061-5/+93
| | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #942 from SISheogorath/feature/openIDChristoph (Sheogorath) Kern2018-10-068-4/+91
|\ \ | | | | | | Add OpenID to CodiMD
| * | Add OpenID to CodiMDSheogorath2018-10-058-4/+91
|/ / | | | | | | | | | | | | | | With OpenID every OpenID capable provider can provide authentication for users of a CodiMD instance. This means we have federated authentication. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #940 from WilliButz/fix-configurable-pathsChristoph (Sheogorath) Kern2018-10-058-45/+39
|\ \ | |/ |/| enhance configurabiltiy of paths & make execution path-independent
| * README: add note about configurable pathsWilliButz2018-09-271-13/+12
| | | | | | | | Signed-off-by: WilliButz <wbutz@cyberfnord.de>
| * removing superfluous config parameters for template filesClaudius2018-09-265-22/+11
| | | | | | | | Signed-off-by: Claudius <opensource@amenthes.de>
| * app.js: add missing routes for configurable pathsWilliButz2018-09-261-0/+3
| | | | | | | | Signed-off-by: WilliButz <wbutz@cyberfnord.de>
| * imageRouter/filesystem: make callback path-independentWilliButz2018-09-261-1/+2
| | | | | | | | | | | | | | Images are now properly served when `config.uploadsPath` differs from its default value. Signed-off-by: WilliButz <wbutz@cyberfnord.de>
| * lib/config: use `path.resolve` instead of `path.join`WilliButz2018-09-261-14/+14
| | | | | | | | | | | | | | | | | | | | | | While paths like `tmpPath` could previously be configured, they were all interpreted relative to `appRootPath` because of `path.join`. Now the configurable paths can be canonical and therefore independent of the `appRootPath`. Signed-off-by: WilliButz <wbutz@cyberfnord.de>
| * lib/config: add environment variable to set config fileWilliButz2018-09-261-1/+2
| | | | | | | | | | | | | | | | | | | | Previously it was assumed that `config.json` would be placed in the same directory as the rest of CodiMD without any optional override. This allows to override the path to the `config.json` by setting `CMD_CONFIG_FILE` to the canonical path of the desired config file. Signed-off-by: WilliButz <wbutz@cyberfnord.de>
| * lib/models/revision.js: make independent of exec-pathWilliButz2018-09-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | Previously calling `app.js` from another directory than the base directory of CodiMD would result in an error being thrown because `lib/workers/dmpWorker.js` could not be found. This change makes the function call independent of the path CodiMD is started from. Signed-off-by: WilliButz <wbutz@cyberfnord.de>
* | Merge pull request #982 from SISheogorath/feature/useNoOpenerChristoph (Sheogorath) Kern2018-10-045-13/+15
|\ \ | | | | | | Add rel="noopener" to target="_blank" links
| * | Add rel="noopener" to target="_blank" linksSheogorath2018-10-045-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The noopener construct protects from some nasty clickjacking attacks. We can apply them savely to all our links since we don't rely on the previously used page. Some more details: https://mathiasbynens.github.io/rel-noopener/ Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #988 from ccoenen/oauth2-docsChristoph (Sheogorath) Kern2018-10-041-0/+9
|\ \ \ | | | | | | | | Oauth2 docs
| * | | details about OAuth2 in general. Fixes #930Claudius Coenen2018-10-041-0/+9
| | | | | | | | | | | | | | | | Signed-off-by: Claudius Coenen <opensource@amenthes.de>
* | | | Merge pull request #981 from SISheogorath/fix/devModeChristoph (Sheogorath) Kern2018-10-041-1/+1
|\ \ \ \ | | | | | | | | | | Add development mode for webpack in package.json
| * | | | Add development mode for webpack in package.jsonSheogorath2018-10-031-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like we have to explicitly tell the new webpack version that we want to use the development environment. This provides us with source maps and similar. This patch adds the commandline option in our scripts in package.json Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Merge pull request #987 from ccoenen/nextcloud-oauth2Christoph (Sheogorath) Kern2018-10-044-0/+52
|\ \ \ \ | |/ / / |/| / / | |/ / How to use Nextcloud as OAuth2 Provider for CodiMD
| * / How to use Nextcloud as OAuth2 Provider for CodiMDClaudius Coenen2018-10-044-0/+52
|/ / | | | | | | Signed-off-by: Claudius Coenen <opensource@amenthes.de>
* | Update yarn.lockSheogorath2018-10-031-4/+1598
| | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #974 from mcnesium/patch-1Christoph (Sheogorath) Kern2018-10-031-3/+3
|\ \ | | | | | | fix image paths
| * | fix image paths in moved GitLab auth guidemcnesium2018-09-301-3/+3
| | | | | | | | | | | | Signed-off-by: mcnesium <git@mcnesium.com>
* | | Merge pull request #958 from SISheogorath/fix/uwsChristoph (Sheogorath) Kern2018-10-032-2/+6
|\ \ \ | | | | | | | | Replace `uws` with `ws` package
| * | | Replace `uws` with `ws` packageSheogorath2018-09-182-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `uws` was deprecated by its maintainer and starts to cause more and more problems and issue reports. So it's time to replace it and use a maintained project instead. Lucky us, `uws` and `ws` can be used in an identical way, without problems. To provide better performance, we install the optional packages as well. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Merge pull request #932 from davidmehren/webpack-4Christoph (Sheogorath) Kern2018-10-038-1797/+3480
|\ \ \ \ | | | | | | | | | | Upgrade to Webpack 4
| * | | | Upgrade to Webpack 4 - development configDavid Mehren2018-09-061-7/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David Mehren <dmehren1@gmail.com>
| * | | | Upgrade to Webpack 4 - remove baseUrl propertyDavid Mehren2018-09-061-2/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David Mehren <dmehren1@gmail.com>
| * | | | Upgrade to Webpack 4 - clean dependenciesDavid Mehren2018-09-062-780/+819
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David Mehren <dmehren1@gmail.com>
| * | | | Upgrade to Webpack 4 - fix CSS import orderDavid Mehren2018-09-062-19/+36
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David Mehren <dmehren1@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 06:34:09 +0000