summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update nl.json (POEditor.com)Christoph (Sheogorath) Kern2018-11-181-105/+178
|
* Merge pull request #1053 from dsprenkels/robots.txtChristoph (Sheogorath) Kern2018-11-174-1/+5
|\ | | | | Disallow creation of robots.txt in freeurl
| * Disallow creation of robots.txt in freeurlDaan Sprenkels2018-11-174-1/+5
| | | | | | | | | | | | | | | | | | | | | | Add a configuration setting to "hard"-disable creation of notes as set by the configuration value. This defaults to `['robots.txt', 'favicon.ico']`, because these files are often accidentally created by bots and browsers. This commit fixes #1052. Signed-off-by: Daan Sprenkels <hello@dsprenkels.com>
* | Merge pull request #943 from SISheogorath/feature/improveSetupChristoph (Sheogorath) Kern2018-11-172-5/+7
|\ \ | | | | | | Some minor improvements for setup script
| * | Run db migrations on startSheogorath2018-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | We should force db migrations to run on every start. This will minimize the impact of breaking migrations in future. While it may causes some issues with the next start since CodiMD won't start when the migrations fail. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * | Some minor improvements for setup scriptSheogorath2018-09-061-4/+6
| | | | | | | | | | | | | | | | | | | | | Since we use `yarn` for our container setup and try to enforce dependencies, we should also use yarn in the setup script. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #1040 from sunbit/masterChristoph (Sheogorath) Kern2018-11-178-8/+8
|\ \ \ | | | | | | | | Fix migration failure due to change on error messages
| * | | Update error message text checksCarles Bruguera2018-11-168-8/+8
| | | | | | | | | | | | | | | | Signed-off-by: Carles Bruguera <carlesba@gmail.com>
* | | | Merge pull request #1059 from SISheogorath/fix/winstonStreamingChristoph (Sheogorath) Kern2018-11-172-2/+10
|\ \ \ \ | | | | | | | | | | Fix streaming for winston
| * | | | Fix streaming for winstonSheogorath2018-11-162-2/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the upgrade of winston in c3584770f24205d84b9399abd9535cb27dc7b00c a the class extension for streaming was removed. This caused silent crashes. Somehow winston simply called `process.exit(1)` whenever `logger.write()` was called. This is really bad and only easy to debug because of the testing right after upgrading. However, reimplementing the stream interface as it was, didn't work, due to the fact that `logger.write()` is already implemented and causes the mentioned problem. So we extent the object with an `stream` object that implements `write()` for streams and pass that to morgan. So this patch fixes unexpected exiting for streaming towards our logging module. References: https://www.digitalocean.com/community/tutorials/how-to-use-winston-to-log-node-js-applications https://github.com/hackmdio/codimd/commit/c3584770f24205d84b9399abd9535cb27dc7b00c https://stackoverflow.com/a/28824464 Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Merge pull request #1058 from ccoenen/bug/oauth2internalerrorChristoph (Sheogorath) Kern2018-11-161-4/+4
|\ \ \ \ | | | | | | | | | | InternalOAuthError is not part of passport, but of passport-oauth2 #1056
| * | | | InternalOAuthError is not part of passport, but of passport-oauth2Claudius Coenen2018-11-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes part of #1056: an error while obtaining the profile would have `502`-crashed the server. Signed-off-by: Claudius Coenen <opensource@amenthes.de>
* | | | | Merge pull request #1057 from ccoenen/eslintChristoph (Sheogorath) Kern2018-11-1613-44/+75
|\ \ \ \ \ | | | | | | | | | | | | switching to eslint for code checking
| * | | | | switching to eslint for code checkingClaudius Coenen2018-11-1413-44/+75
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | most rules degraded to WARN, so we don't go insane. This will change over time. The aim is to conform to a common style Signed-off-by: Claudius Coenen <opensource@amenthes.de>
* | | | | Merge pull request #1055 from SISheogorath/upgrade/winstonChristoph (Sheogorath) Kern2018-11-147-17/+25
|\ \ \ \ \ | | | | | | | | | | | | Upgrade winston / refactor logging
| * | | | | Upgrade winstonSheogorath2018-11-147-17/+25
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our log library got a new major version which should be implemented. That's exactly what this patch does. Implementing the new version of the logging library. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | | Merge pull request #1047 from SISheogorath/docs/slideModeChristoph (Sheogorath) Kern2018-11-143-15/+29
|\ \ \ \ \ | |_|/ / / |/| | | | Add documentation for document type
| * | | | Add documentation for slide view mode to features pageSheogorath2018-11-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it's a very useful feature, we should mention it in multiple locations. So we mention it in the slide mode section of the features page. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * | | | Some minor improvements to the yaml-metadata docsSheogorath2018-11-141-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switching form XAML to YAML syntax highlighting and fixing some grammar. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * | | | Add documentation for type fieldSheogorath2018-11-141-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The yaml-metadata documentation should mention the type field. This is also open for future extension. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * | | | Activate slide editing mode for exampleSheogorath2018-11-141-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have this awesome editing mode for slide shows. We just don't enable it or tell anyone that it exists. Maybe we should do this. This patch sets the type for the slide example. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Merge pull request #1054 from SISheogorath/fix/otLoggingChristoph (Sheogorath) Kern2018-11-131-5/+5
|\ \ \ \ | |/ / / |/| | | Fix logging in ot module
| * | | Fix logging in ot moduleSheogorath2018-11-131-5/+5
|/ / / | | | | | | | | | | | | | | | | | | Seems like there was some debugging going on some day, this patch should make sure the right logging is used. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #1027 from asg017/masterChristoph (Sheogorath) Kern2018-11-121-0/+3
|\ \ \ | | | | | | | | Add download action to published notes
| * | | forgot break statementAlex Garcia2018-10-271-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Alex Garcia <alexsebastian.garcia@gmail.com>
| * | | Add download action to published notesAlex Garcia2018-10-271-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Alex Garcia <alexsebastian.garcia@gmail.com>
* | | | Merge pull request #983 from SISheogorath/fix/disableIndexesChristoph (Sheogorath) Kern2018-11-121-1/+1
|\ \ \ \ | | | | | | | | | | Enforce disabled index for static assets
| * | | | Enforce disabled index for static assetsSheogorath2018-11-121-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | ExpressJS still does allow serving index.html files. This change disables that permanently. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Merge pull request #1028 from SISheogorath/docs/editorModesChristoph (Sheogorath) Kern2018-11-121-2/+16
|\ \ \ \ | | | | | | | | | | Add documentation about editor modes in features page
| * | | | Add documentation about editor modes in features pageSheogorath2018-10-281-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Codemirror provides various modes via keymapping. These are already available by a menu in the interface. But they aren't mentioned anywhere. This patch provides some documentation about the editor modes and their implications. Since they are a feature, the documentation is done on the features page. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | | Merge pull request #1048 from dsprenkels/etherpad-migration-guideChristoph (Sheogorath) Kern2018-11-121-0/+131
|\ \ \ \ \ | | | | | | | | | | | | Add an etherpad migration guide
| * | | | | Add an etherpad migration guideDaan Sprenkels2018-11-101-0/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this guide I share how a migration from etherpad to codimd can be done. I am not completely sure if the script that is included is completely error-free. Readers/reviewers should be aware that there may be bugs.may be bugs. Signed-off-by: Daan Sprenkels <hello@dsprenkels.com>
* | | | | | Update yarn.lockSheogorath2018-11-121-26/+12
| | | | | |
* | | | | | Merge pull request #1051 from SISheogorath/feature/fullversionChristoph (Sheogorath) Kern2018-11-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix wrong reading from commit
| * | | | | | Fix wrong reading from commitSheogorath2018-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now we use a substr after reading the commit. That's definitely wrong and leads to wrong commit hashes since the first 5 chars are missing. This patch removes the substr usage here and this way fixes the generated links. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | | | | Merge pull request #1046 from SISheogorath/feature/optimizeXSSChristoph (Sheogorath) Kern2018-11-113-10/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove the xss library from webpack
| * | | | | | | Remove the xss library from webpackSheogorath2018-11-103-10/+7
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can load the xss functions directly from the library instead of loading them through the expose loader of webpack, this should simplify the setup and maybe even improve speed a bit. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | | | | Merge pull request #961 from SISheogorath/feature/osTEMPChristoph (Sheogorath) Kern2018-11-112-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use OS based tmp dir
| * | | | | | | Use OS based tmp dirSheogorath2018-10-312-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should use the official OS temp directory instead of an own one, to not run into conflicts. Also various dependencies already use the OS temp directory, which makes it pointless to use a different for our internal purposes then. This commit provides the changes needed to use the OS tmp directory by default. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | | | | | Merge pull request #991 from SISheogorath/feature/fullversionChristoph (Sheogorath) Kern2018-11-119-7/+52
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | Add full version string (and no AGPL violation detection)
| * | | | | | Add full version stringSheogorath2018-11-119-7/+52
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we only provide the version from `package.json`. This means that during updates of instances, e.g. the demo instance, which runs latest master instead of a stable release, changes are not reflected to the webclient. This patch adds a fullversion string that contains the current commit and this way makes that clients are notified about changes. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | | | Merge pull request #1041 from micedre/export-menu-fixChristoph (Sheogorath) Kern2018-11-073-8/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix menu when gitlab is enabled
| * | | | | | Fix menu for github and dropboxCédric Couralet2018-11-073-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Cédric Couralet <cedric.couralet@gmail.com>
| * | | | | | Fix menu when gitlab is enabledCédric Couralet2018-11-072-6/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Cédric Couralet <cedric.couralet@gmail.com>
* | | | | | Merge pull request #1033 from SISheogorath/fix/versionsChristoph (Sheogorath) Kern2018-11-061-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Upgrade some package versions
| * | | | | | Upgrade some package versionsSheogorath2018-10-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `npm audit` reports a ton of issues on CodiMD. Most of them are minor issues, but these are still things that should be fixed. This changes were created by running `npm audit fix`. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | | | | Merge pull request #1034 from SISheogorath/fix/emojiPluginChristoph (Sheogorath) Kern2018-11-061-7/+6
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Again: Replace emoji-plugin regex
| * | | | | | Again: Replace emoji-plugin regexSheogorath2018-10-311-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Regex introduced in the last commit[1], was already working quite good. But still resulted in false positives for all URL that contained a second `:`. To fix this once and for all, we craft a simple, but long regex based on all emoji names and use this to match them. We could probably optimize it, but that should also be something the regex engine itself can and should do. [1]: 7e45533c75a3697c916e52e5f4ddff42a38bd3d5 (in this source tree) Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | | | | Merge pull request #1035 from ccoenen/feature/global-site-layout-varsClaudius Coenen2018-11-0512-128/+103
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | removing global site layout vars from individual routers
| * | | | | | removing global site layout vars from individual routers, putting them into ↵Claudius2018-11-0312-128/+103
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app.local Signed-off-by: Claudius <opensource@amenthes.de>