summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #45 from ccoenen/masterChristoph (Sheogorath) Kern2019-04-161-18/+19
|\ | | | | fixing manual upgrade instructions and completing requirements
| * fixing manual upgrade instructions and completing requirementsClaudius2019-04-151-18/+19
| | | | | | | | Signed-off-by: Claudius <opensource@amenthes.de>
* | fix unix socket not removed on shutdown (#50)naimo2019-04-161-0/+3
| | | | | | | | | | | | * fix unix socket not removed on shutdown Signed-off-by: naimo <nicolas@aimon.fr>
* | Update yarn.lockSheogorath2019-04-161-26/+12
| |
* | Merge pull request #48 from SISheogorath/fix/graphvizXSSChristoph (Sheogorath) Kern2019-04-162-6/+8
|\ \ | |/ |/| Fix stored XSS in the graphviz error message rendering
| * Fix stored XSS in the graphviz error message rendering [Security Issue]Max Wu2019-04-162-6/+8
|/ | | | | | Signed-off-by: Max Wu <jackymaxj@gmail.com> Co-Authored-By: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #43 from SISheogorath/feature/communityChristoph (Sheogorath) Kern2019-04-122-4/+7
|\ | | | | Add community forum to help section
| * Add community forum to help sectionSheogorath2019-04-122-4/+7
| | | | | | | | | | | | | | | | | | | | | | We have a community forum and want to use it for users support and to bring developers and end-users together. In order to achieve this, it would be helpful to inform users about its existence. This patch adds the community forum as resource to the help section and aligns it along the Matrix channel and GitHub issue tracker. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #42 from SISheogorath/fix/meta-markedChristoph (Sheogorath) Kern2019-04-122-2/+2
|\ \ | | | | | | Update meta-marked to fix possible vulnerabilities
| * | Update yarn to version 1.15.2Sheogorath2019-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The yarn version we use in CI is quite outdated. This brings up the problem that it doesn't support semver for git repositories. In order to fix that problem updating yarn seems to be the right thing to do. This patch should fix the CI problem caused by the semver git URL. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * | Update meta-marked to fix possible vulnerabilitiesSheogorath2019-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snyk informed us about possible vulnerabilities in meta-marked. It seems like at least some of them were already address by HackMD around a year ago but never pushed upstream to CodiMD. This patch provides a fix by using an up-to-date dependency from our own repository with CI integration. Details: https://app.snyk.io/vuln/SNYK-JS-JSYAML-174129 Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Update zh-CN.json (POEditor.com)Christoph (Sheogorath) Kern2019-04-121-57/+59
| |/ |/|
* | Update yarn.lockSheogorath2019-04-101-492/+209
|/ | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #33 from codimd/lutim-supportChristoph (Sheogorath) Kern2019-04-107-6/+56
|\ | | | | Add support for image hosting with lutim
| * Add lutim supportDylan Dervaux2019-04-107-6/+56
| | | | | | | | Signed-off-by: Dylan Dervaux <dylanderv05@gmail.com>
* | Merge pull request #41 from SISheogorath/js-diagram-v2Christoph (Sheogorath) Kern2019-04-101-1/+1
|\ \ | | | | | | Fix broken dependency js-sequence-diagrams
| * | Fix broken dependency js-sequence-diagramsSheogorath2019-04-101-1/+1
|/ / | | | | | | | | | | | | | | | | A few days ago the dependency was removed from npm. this causes various setups to fail and blocks deployments and development. This patch should fix the dependency and allow CodiMD to move forward. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #38 from codimd/snyk-fix-d5beoiChristoph (Sheogorath) Kern2019-04-071-1/+1
|\ \ | |/ |/| [Snyk] Fix for 1 vulnerable dependencies
| * fix: package.json to reduce vulnerabilitiessnyk-bot2019-04-071-1/+1
|/ | | | | The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-JSYAML-174129
* Merge pull request #30 from codimd/samlConfigChristoph (Sheogorath) Kern2019-04-066-1/+7
|\ | | | | Added a configuration option for passport-saml:
| * Added a configuration option for passport-saml:Emmanuel Ormancey2019-04-066-1/+7
|/ | | | | | | | | | | disableRequestedAuthnContext: true|false By default only Password authmethod is accepted, this option allows any other method. Issue and option described here: https://github.com/bergie/passport-saml/issues/226 Signed-off-by: Emmanuel Ormancey <emmanuel.ormancey@cern.ch>
* Merge pull request #31 from codimd/hidePortMinioChristoph (Sheogorath) Kern2019-04-061-1/+3
|\ | | | | Hide port minio
| * Hide port from minio URL for protocol default portThor772019-04-061-1/+3
|/ | | | Signed-off-by: Thor77 <thor77@thor77.org>
* Merge pull request #37 from stragu/patch-1Christoph (Sheogorath) Kern2019-04-051-2/+2
|\ | | | | change default mode to "both" when clicking edit
| * change default mode to "both" when clicking editStéphane Guillou2019-04-051-2/+2
|/ | | | | | | | | | Add "both" mode to URLs because I assume most people want to straight away see the code when they click the "edit" button in a published note. Fixes https://github.com/codimd/server/issues/27 Not tested, followed instructions from @ccoenen , please do review! :) Signed-off-by: Stéphane Guillou <stephane.guillou@member.fsf.org>
* Update sr.json (POEditor.com)Christoph (Sheogorath) Kern2019-04-041-2/+4
|
* Merge pull request #35 from ccoenen/enhancement/translation-churnChristoph (Sheogorath) Kern2019-04-042-0/+7
|\ | | | | specifying the locale jsons to be in the exact style of poeditor
| * specifying the locale jsons to be in the exact style of poeditor should cut ↵Claudius2019-04-042-0/+7
| | | | | | | | | | | | down on unneccessary changes ('churn') Signed-off-by: Claudius <opensource@amenthes.de>
* | Update pl.json (POEditor.com)Christoph (Sheogorath) Kern2019-04-041-11/+15
|/
* Clean up headingsHenrik "HerHde" Hüttemann2019-04-041-147/+173
| | | | Signed-off-by: Henrik "HerHde" Hüttemann <mail@herh.de>
* tiny correction to url. also adding RSS feed.Claudius Coenen2019-04-041-2/+2
|
* Update community call URLSheogorath2019-04-031-1/+1
| | | | | | | | | | We have a discourse forum and since it's the place for all kinds of community organisation, this should be used for organising the community calls. This patch updates the link to the new topic in the forum. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* more ways to engage with the community added to the readmeClaudius2019-04-031-7/+20
| | | | Signed-off-by: Claudius <opensource@amenthes.de>
* Merge pull request #22 from SISheogorath/feature/newScreenshotChristoph (Sheogorath) Kern2019-04-021-0/+0
|\ | | | | Add new screenshot
| * Add new screenshotSheogorath2019-04-011-0/+0
|/ | | | | | | | | | | | The old screenshot is quite dated since it's from the earlier days of HackMD. But we developed a lot in the recent years. Changed the name, added a toolbar, moved buttons, and so on. This patch should represent those changes in the front page. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Add missing space to footerHenrik Hüttemann2019-04-011-1/+1
| | | | Signed-off-by: Henrik "HerHde" Hüttemann <mail@herh.de>
* minor fixes to internal links in documentationClaudius2019-04-012-12/+12
|
* Merge pull request #15 from ccoenen/feature/documentation-overhaulClaudius Coenen2019-04-0168-546/+1049
|\ | | | | Documentation overhaul
| * moving code of conduct into its own file for better discoverabilityClaudius2019-04-012-39/+40
| | | | | | | | Signed-off-by: Claudius <opensource@amenthes.de>
| * breaking up config docs into sectionsClaudius2019-04-012-76/+292
| | | | | | | | Signed-off-by: Claudius <opensource@amenthes.de>
| * striving for consistency across various docsClaudius2019-04-0127-171/+175
| | | | | | | | Signed-off-by: Claudius <opensource@amenthes.de>
| * integrating information from the old wikiClaudius2019-04-013-4/+211
| | | | | | | | Signed-off-by: Claudius <opensource@amenthes.de>
| * removing doctoc, which is no longer being usedClaudius2019-04-012-10/+1
| | | | | | | | Signed-off-by: Claudius <opensource@amenthes.de>
| * splitting README.md into files in /docs for better readabilityClaudius2019-04-0156-374/+458
|/ | | | Signed-off-by: Claudius <opensource@amenthes.de>
* Merge pull request #9 from SISheogorath/feature/moveUploadChristoph (Sheogorath) Kern2019-03-315-23/+13
|\ | | | | Move upload button into toolbar
| * Move upload button into toolbarSheogorath2019-03-255-23/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently we have the odd situation to have two toolbars. One inside the header and one in the editor. Since we only show the image upload button when the editor is visible we should move the upload button into the editor toolbar. This patch does this by adding the image upload button besides the image tag button. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #14 from SISheogorath/fix/LICENSEChristoph (Sheogorath) Kern2019-03-311-3/+10
|\ \ | | | | | | Fix LICENSE content
| * | Fix LICENSE contentSheogorath2019-03-311-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | It seems like the license was never correctly filled. This patch updates the LICENSE file to represent members of the community and major code contributors. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #13 from ccoenen/feature/heroku-cleanupClaudius Coenen2019-03-313-51/+33
|\ \ \ | | | | | | | | cleanup of the heroku configuration
| * | | cleanup of the heroku configurationClaudius2019-03-313-51/+33
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | this removes the general `postinstall` call to `bin/heroku` and instead puts it into a heroku-prebuild hook. At the same time, env vars get updated to use the `CMD` prefix. The configured buildpacks were not used. Finally, npm run build is now automatically done by Heroku. Signed-off-by: Claudius <opensource@amenthes.de>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 21:52:22 +0000