summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | Fix #1016: webpack include defect for scripts and header files.MartB2018-10-164-39/+48
|/ / / | | | | | | | | | Signed-off-by: MartB <mart.b@outlook.de>
* | | 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 codemirror
| * | | Add autocomplete for highlight.js languages into codemirrorSheogorath2018-10-101-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now we support code highlighting for rust, but it doesn't appear in autocomplete of codemirror, because codemirror is not aware of it. This patch lets highlightjs simply tell codemirror, what it supports and adds this to the autocomplete list. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Update yarn.lockSheogorath2018-10-111-16/+22
| | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #985 from SISheogorath/fix/helmetCSPChristoph (Sheogorath) Kern2018-10-112-2/+2
|\ \ \ | | | | | | | | Add `data:` URL to CSP and upgrade helmet
| * | | Add `data:` URL to CSP and upgrade helmetSheogorath2018-10-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like the old version of helmet had a problem with `data:`. This patch upgrades to the latest version and adds the CSP rule to allow Google Fonts and the offline version of it, to properly include the fonts and no longer throw ugly error messages at us. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 23:04:43 +0000