summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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
|/
* Merge pull request #890 from hackmdio/fix-csp-for-speaker-notesChristoph (Sheogorath) Kern2018-07-051-1/+1
|\ | | | | Replaces script src hash for speaker note to CSP directives
| * Add script src hash for speaker note to CSP directivesMax Wu2018-07-051-1/+1
|/ | | | Signed-off-by: Max Wu <jackymaxj@gmail.com>
* Merge pull request #886 from SISheogorath/fix/ToCHeaderChristoph (Sheogorath) Kern2018-07-042-46/+70
|\ | | | | Refactor generation of ToC
| * ToC: Some HTML improvements and style fixesSheogorath2018-07-042-6/+20
| | | | | | | | | | | | | | | | The ToC generated broken HTML with unclosed `<li>` tags. This got fixed as well as some minor optimisation and adding list elements for the subentries so the elements appear in the ToC while scrolling. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * Ignore h6 headersSheogorath2018-07-041-1/+1
| | | | | | | | | | | | | | h6 headers are used for tags in CodiMD. So we should ignore them for the ToC generation. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * Refactor generation of ToCSheogorath2018-07-041-45/+55
| | | | | | | | | | | | | | | | | | | | This replaces the existing iterative implementation of the ToC generation with an recursive one. This also solves the problem of skipped headers which causes wrong leveling of them. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #883 from SISheogorath/fix/contentTypesChristoph (Sheogorath) Kern2018-07-031-2/+4
|\ \ | | | | | | Fixing content types in status router
| * | Fixing content types in status routerSheogorath2018-07-031-2/+4
| |/ | | | | | | | | | | | | | | As it turns out, expressjs doesn't detect the right mimetype and it seems like I didn't bother to test this enough. So lets fix it for the next release. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #884 from SISheogorath/fix/nightModeChristoph (Sheogorath) Kern2018-07-034-4/+17
|\ \ | |/ |/| Fix some night mode colors
| * Remove some unneeded defined inline-stylingsSheogorath2018-07-031-2/+2
| | | | | | | | | | | | These have no really useful point here. Let's just remove them. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * Fix some night mode colorsSheogorath2018-07-033-2/+15
|/ | | | | | | | We have some issues with night mode and the font color. This should fix this in the permission table and the delete node modal. As well as some picture styling. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Update it.json (POEditor.com)Christoph (Sheogorath) Kern2018-07-021-103/+114
|
* Release 1.2.0Sheogorath2018-06-301-1/+1
| | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Release notes for 1.2.0Sheogorath2018-06-301-0/+48
| | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Update de.json (POEditor.com)Christoph (Sheogorath) Kern2018-06-301-108/+114
|
* Update yarn.lockSheogorath2018-06-301-17/+34
|
* Revert "Update pg"Sheogorath2018-06-301-1/+1
| | | | This reverts commit 4d4163c1705af7dbdeeac3e788e72f6683221680.
* Update yarn.lockSheogorath2018-06-301-106/+286
| | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #871 from SISheogorath/update/dependenciesChristoph (Sheogorath) Kern2018-06-309-85/+46
|\ | | | | Update dependencies
| * Update randomcolorSheogorath2018-06-301-1/+1
| | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * Update pgSheogorath2018-06-301-1/+1
| | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * Update storeSheogorath2018-06-302-60/+21
| | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * Update highlight.jsSheogorath2018-06-305-5/+5
| | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * Update xss protectionSheogorath2018-06-301-1/+1
| | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * Update sqliteSheogorath2018-06-301-1/+1
| | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>