summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | | | Merge pull request #1030 from Eronana/patch-1Christoph (Sheogorath) Kern2018-10-311-37/+67
|\ \ \ \ \ | | | | | | | | | | | | add option reset in bin/manage_users
| * | | | | feat(bin): ensure email existsErona2018-10-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Erona <erona@loli.bz>
| * | | | | feat(bin): add option --reset to reset user passwordErona2018-10-291-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Erona <erona@loli.bz>
| * | | | | refactor(bin): add function getPass in bin/manage_usersErona2018-10-291-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Erona <erona@loli.bz>
| * | | | | refactor(bin): eliminate `var` and use template string refactor string thingsErona2018-10-291-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Erona <erona@loli.bz>
| * | | | | refactor(bin): add function showUsage to refactor usage thingsErona2018-10-291-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Erona <erona@loli.bz>
| * | | | | refactor(bin): refactor check args in bin/manage_usersErona2018-10-291-14/+17
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Erona <erona@loli.bz>
* | | | | Merge pull request #1031 from SISheogorath/fix/emojiPluginChristoph (Sheogorath) Kern2018-10-311-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / Fix emoji regex
| * / / Fix emoji regexSheogorath2018-10-291-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old regex, adapted from the other plugins, was a bit too open for matching. This leads to matching something like: `This is a sentence: [And something with a: in it.]()` which doesn't become a link anymore. Because the match is: ` [And something with a`. This patch provides a fix for the regex to only match non-space string within the `:`'s. References: - Introducing commit: https://github.com/hackmdio/codimd/commit/2063eb8bdf9c0537e9fcfadd7f587658c72bd281 - Inspirational source of the original RegEx: https://github.com/hackmdio/codimd/blob/2063eb8bdf9c0537e9fcfadd7f587658c72bd281/public/js/extra.js#L1095 Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Update it.json (POEditor.com)Christoph (Sheogorath) Kern2018-10-281-1/+2
| | |
* | | Update fr.json (POEditor.com)Christoph (Sheogorath) Kern2018-10-281-3/+4
| |/ |/|
* | Merge pull request #997 from SISheogorath/docs/slidePrintChristoph (Sheogorath) Kern2018-10-221-1/+1
|\ \ | | | | | | slide example: Add link to slide printing instructions
| * | slide example: Add link to slide printing instructionsSheogorath2018-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | The printing instructions seem to not be really clear. Linking the reveal.js offical docs should help. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #1006 from SISheogorath/fix/missingEmojisChristoph (Sheogorath) Kern2018-10-221-0/+15
|\ \ \ | | | | | | | | Fix not rendered autocomplete emojis
| * | | Fix not rendered autocomplete emojisSheogorath2018-10-101-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we have some emojis that are autocompleted but won't show up in the resulting document. This patch adds all emojis that are pushed to Codemirror and applies them to the markdown rendering process, so they become usable. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Merge pull request #1021 from davidmehren/webpack-4Christoph (Sheogorath) Kern2018-10-191-15/+15
|\ \ \ \ | |_|_|/ |/| | | Webpack: Cleanup common config
| * | | Code style fixes for webpack.common.jsDavid Mehren2018-10-191-9/+9
| | | | | | | | | | | | | | | | Signed-off-by: David Mehren <dmehren1@gmail.com>
| * | | Use const instead of var in webpack configs.David Mehren2018-10-191-6/+6
|/ / / | | | | | | | | | Signed-off-by: David Mehren <dmehren1@gmail.com>
* | | Merge pull request #1018 from SISheogorath/remove/gitterChristoph (Sheogorath) Kern2018-10-174-7/+5
|\ \ \ | | | | | | | | Remove Gitter from codebase
| * | | Remove Gitter from codebaseSheogorath2018-10-174-7/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer use Gitter for development talk and similar. So we might want to remove it? This patch removes Gitter from README, help page and features page. And replaces it in the help modal with POEditor, our translation platform. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #1017 from MartB/masterChristoph (Sheogorath) Kern2018-10-164-39/+48
|\ \ \ | | | | | | | | Fix #1016: webpack include defect for scripts and header files.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 17:09:31 +0000