summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 #967 from SISheogorath/fix/followChristoph (Sheogorath) Kern2018-09-261-1/+1
|\ | | | | Add POEditor to 'follow us' statement
| * Add POEditor to 'follow us' statementSheogorath2018-09-261-1/+1
|/ | | | | | | We broke the follow us before by removing Facebook and Twitter. Adding POEditor should fix it and help to attract new translators. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #964 from SISheogorath/fix/gitlabWarningChristoph (Sheogorath) Kern2018-09-251-1/+1
|\ | | | | Omit unneeded warning if no gitlab is configured
| * Omit unneeded warning if no gitlab is configuredSheogorath2018-09-251-1/+1
|/ | | | | | | This patch should fix the unneeded warning of the wrong API version, when gitlab isn't configured at all. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #963 from SISheogorath/fix/crashPDFChristoph (Sheogorath) Kern2018-09-241-0/+4
|\ | | | | Fix server crash on PDF creation
| * Fix server crash on PDF creationSheogorath2018-09-241-0/+4
|/ | | | | | | | | `markdown-pdf` seems to fail to provide the PDFs on tmpfs. This leads crashing codimd which expects the file to be there. This patch should add some proper error handling when expectation and reality don't fit together. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #962 from SISheogorath/feature/indonesianChristoph (Sheogorath) Kern2018-09-233-1/+117
|\ | | | | Add indonesian language to CodiMD
| * Add indonesian language to CodiMDSheogorath2018-09-233-1/+117
|/ | | | | | Big thanks @filosofikode for the translation work! Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Remove dead link from READMESheogorath2018-09-121-3/+0
| | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Update yarn.lockSheogorath2018-09-061-2/+2
|
* Merge pull request #939 from SISheogorath/fix/migrationsV2Christoph (Sheogorath) Kern2018-09-068-9/+9
|\ | | | | Extend migration error handling
| * Extend migration error handlingSheogorath2018-09-058-9/+9
| | | | | | | | | | | | | | | | | | | | The current error handling seems to conflict with some sequelize versions. So we add a second version of it in our excemptions. I'm not happy about it, but when it helps to prevent further migration breaking, it's worth it. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Fix typo in linkSheogorath2018-09-061-1/+1
| |
* | Change to new codimd-container repositorySheogorath2018-09-061-4/+4
| | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #929 from maxer456/mattermost-auth-guideChristoph (Sheogorath) Kern2018-09-066-1/+59
|\ \ | | | | | | Add an auth provider guide for Mattermost
| * | Add an auth provider guide for MattermostOndřej Slabý2018-08-286-1/+59
| | | | | | | | | | | | Signed-off-by: Ondřej Slabý <kron258@gmail.com>
* | | Merge pull request #936 from SISheogorath/fix/lzstringChristoph (Sheogorath) Kern2018-09-051-4/+4
|\ \ \ | | | | | | | | Switch to own, fixed, lz-string version
| * | | Switch to own, fixed, lz-string versionSheogorath2018-09-051-4/+4
| |/ / | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #938 from SISheogorath/fix/nodeTestingChristoph (Sheogorath) Kern2018-09-051-1/+1
|\ \ \ | |_|/ |/| | Remove tests using node version 7
| * | Remove tests using node version 7Sheogorath2018-09-051-1/+1
|/ / | | | | | | | | | | Since node 7 is EOL and may breaks some new builds, we want to get rid of it. But having tests in version 8 would be nice, right? So here we go. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #906 from SISheogorath/fix/letterAvatarMailChristoph (Sheogorath) Kern2018-09-051-0/+4
|\ \ | |/ |/| Fix possible weird objects as email
| * Fix possible weird objects as emailSheogorath2018-07-271-0/+4
| | | | | | | | | | | | | | It seems like some providers return strange types for emails which cause problems. We default to something that is definitely a string. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #928 from Pingu501/bugfix/wrong-gitlab-api-version-checkChristoph (Sheogorath) Kern2018-08-231-2/+2
|\ \ | | | | | | BUGFIX: wrong version check for gitlab api
| * | BUGFIX: wrong version check for gitlab apiAlexander Hesse2018-08-231-2/+2
|/ / | | | | | | Signed-off-by: Alexander Hesse <alexander.hesse@sandstorm-media.de>
* | Merge pull request #924 from cloudron-io/cloudronChristoph (Sheogorath) Kern2018-08-211-0/+7
|\ \ | | | | | | Add Cloudron as an installation method
| * | Add Cloudron as an installation methodGirish Ramakrishnan2018-08-201-0/+7
|/ / | | | | | | | | | | Fixes #923 Signed-off-by: Girish Ramakrishnan <girish@cloudron.io>
* | Merge pull request #910 from hackmdio/change-social-linksChristoph (Sheogorath) Kern2018-07-311-1/+1
|\ \ | | | | | | Update to replace Twitter and Facebook to Riot
| * | Update to replace Twitter and Facebook to RiotMax Wu2018-07-311-1/+1
|/ / | | | | Signed-off-by: Max Wu <jackymaxj@gmail.com>
* | Merge pull request #908 from micedre/gitlabV4Christoph (Sheogorath) Kern2018-07-316-9/+24
|\ \ | | | | | | Add possibility to choose between version v3 or v4 for the gitlab api.
| * | Add possibility to choose between version v3 or v4 for the gitlab api.Cédric Couralet2018-07-316-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | Apart from the uri versioning, one big change is the snippet visibility post data (visibility_level -> visibility) Default gitlab api version to v4 Signed-off-by: Cédric Couralet <cedric.couralet@gmail.com>
* | | Merge pull request #894 from hcaloto/fixMigrationIssuesChristoph (Sheogorath) Kern2018-07-318-2/+56
|\ \ \ | |/ / |/| | Add missing catch blocks for migration from 1.1.1 to 1.2.0
| * | Add missing catch blocks for migration from 1.1.1 to 1.2.0Hugo Caloto2018-07-318-2/+56
| | | | | | | | | | | | Signed-off-by: Hugo Caloto <hcaloto@gmail.com>
* | | Merge pull request #907 from SISheogorath/fix/historyLZStringChristoph (Sheogorath) Kern2018-07-282-2/+19
|\ \ \ | | | | | | | | Some minor improvements for LZString handling
| * | | Further improvement of error handling for LZStringSheogorath2018-07-272-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This does some more in depth check on the error message and minimizes the log noise that is caused by LZString. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * | | Minimize number of errors in LZString parsing errors for historySheogorath2018-07-271-0/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | Right now we still see a lot of LZString parsing errors in the logs. They probably come from the user history. We should minimize the number by add the basic length check there as well. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #902 from ahihi/listen-address-optionsChristoph (Sheogorath) Kern2018-07-274-3/+20
|\ \ \ | | | | | | | | Support 'host' & 'path' config options
| * | | Support 'host' & 'path' config optionsMiranda Kastemaa2018-07-274-3/+20
| |/ / | | | | | | | | | Signed-off-by: Miranda Kastemaa <miranda@foldplop.com>
* / / Update markdown-pdfSheogorath2018-07-272-4/+4
|/ / | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Add mailmap for contributorsSheogorath2018-07-271-0/+14
| | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #896 from maahl/default_img_upload_typeChristoph (Sheogorath) Kern2018-07-271-1/+1
|\ \ | | | | | | Upload images to the filesystem by default, rather than to imgur
| * | Upload images to the filesystem by default, rather than to imgurMaxence Ahlouche2018-07-091-1/+1
| |/ | | | | | | Signed-off-by: Maxence Ahlouche <maxence.ahlouche@gmail.com>
* | Merge pull request #893 from w4tsn/patch-2Christoph (Sheogorath) Kern2018-07-271-2/+2
|\ \ | | | | | | Fix some false titles
| * | Fix some false titlesAlexander Wellbrock2018-07-081-2/+2
| |/ | | | | Signed-off-by: Alexander Wellbrock <a.wellbrock@mailbox.org>
* / Update ja.json (POEditor.com)Christoph (Sheogorath) Kern2018-07-101-103/+114
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 14:02:07 +0000