summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix some minor quirks in the LinuxServer.io docsSheogorath2019-08-012-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current documents might end up confusing people and are not completely accessible. This minor fixes should clear up the situation and add alt texts to all badges, explain the links at the end of the docs, and list LinuxServer.io in the supported provider section of the README. Some reasoning on the change in the listing: Since we maintain an own container image which is for sure kept updated on release, this is our first listing, as well as general solutions that are build on that image, like the K8s integration. The next listings are integrated provides which allow self-hosting, like Cloudron and I also consider LinuxServer.io as this kind of providers. Which try to enable people to run CodiMD on their own hardware or rented servers in a very easy way, but by using their own images. As third category I would look at hosted offers, like Heroku, which are not completely SaaS but far enough away from the self-hostability that I consider them as an own category. PaaS-based solutions are not as FOSS-style as we want our setups to be, but of course still supported. Finally the manual setup. We keep it down here, because we support it, but don't recommend it in general. It's hard to upgrade and can cause problems when dependencies are not correctly updated or people don't run the db migrations. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #111 from CHBMB/ls.ioSheogorath2019-06-133-2/+17
|\ | | | | Add docker image from LinuxServer.io as an install option.
| * Add docker image from LinuxServer.io as an install option.chbmb2019-06-123-2/+17
|/ | | | | As requested by @SISheogorath [here](https://github.com/linuxserver/docker-codimd/issues/4#issue-454332233) and further to discussion about previous PR [here.](https://github.com/codimd/server/pull/110#issuecomment-501214087) Signed-off-by: Neil Green <chbmb@linuxserver.io>
* Merge pull request #106 from SISheogorath/fix/dco-locationSheogorath2019-06-112-1/+1
|\ | | | | Move DCO into docs section
| * Move DCO into docs sectionSheogorath2019-06-102-1/+1
|/ | | | | | | | | | | | | | The DCO currently resides in an own directory creating a pointless additional click/tab in order to reach end read it. It also just clutteres the directory structure of the project. Therefore this patch provides moves the DCO into an own legal section in the docs directory, which is hopefully a more reasonable place. This section can also be extended in future in order to host other legal documents as well. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #103 from SISheogorath/feature/improve-loggingSheogorath2019-06-0915-69/+54
|\ | | | | Rework debug logging
| * Rework debug loggingSheogorath2019-06-0815-69/+54
|/ | | | | | | | | | | | | | We have various places with overly simple if statements that could be handled by our logging library. Also a lot of those logs are not marked as debug logs but as info logs, which can cause confusion during debugging. This patch removed unneeded if clauses around debug logging statements, reworks debug log messages towards ECMA templates and add some new logging statements which might be helpful in order to debug things like image uploads. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #97 from SISheogorath/fix/lintingSheogorath2019-06-0450-1040/+1053
|\ | | | | Fix eslint warnings
| * Fix eslint warningsSheogorath2019-05-3150-1040/+1053
| | | | | | | | | | | | | | | | | | | | | | Since we are about to release it's time to finally fix our linting. This patch basically runs eslint --fix and does some further manual fixes. Also it sets up eslint to fail on every warning on order to make warnings visable in the CI process. There should no functional change be introduced. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #93 from ttasovac/masterSheogorath2019-06-042-0/+63
|\ \ | | | | | | fixed styling of slides preview
| * | fixed styling of slides previewToma Tasovac2019-05-302-0/+63
| |/ | | | | | | Signed-off-by: Toma Tasovac <ttasovac@humanistika.org>
* | Merge pull request #98 from codimd/ccoenen-patch-1Claudius Coenen2019-05-311-0/+4
|\ \ | | | | | | mentioning the node 6 deprecation along with the migration guide
| * | mentioning the node 6 deprecation along with the migration guideClaudius Coenen2019-05-311-0/+4
|/ / | | | | Signed-off-by: Claudius <opensource@amenthes.de>
* | Release version 1.4.0Sheogorath2019-05-312-2/+75
| | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #94 from SISheogorath/fix/mathjaxSheogorath2019-05-301-1/+11
|\ \ | |/ |/| Fix hidden MathJax output
| * Fix hidden MathJax outputSheogorath2019-05-301-1/+11
|/ | | | | | | | | | | | | | | In order to have a better experience when linking to headlines based on their ID, a patch[1] introduced a new CSS construct to add some space in front of HTML tags with an id field. Therefore they would no longer be hidden by a visible navbar. This cause a regression bug by moving the rendered mathjax out of its visible area. This patch fixes the problem by restricting the previous change to headlines only. [1]: commit c9af13cf34d1b4d66e4c3a590b875669455122a4 Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Update yarn.lockSheogorath2019-05-301-465/+466
| | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Add Discourse link to footerSheogorath2019-05-301-1/+1
| | | | | | | | As we are about to announce the community forum, we should provide a link to it in the footer. This patch adds Discouse between Riot, GitHub and Mastodon as platform to follow our progress. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #81 from SISheogorath/fix/codemirrorBottomCSSSheogorath2019-05-261-1/+4
|\ | | | | Fix CodeMirror toolbar hiding content
| * Fix CodeMirror toolbar hiding contentSheogorath2019-05-261-1/+4
| | | | | | | | | | | | | | | | | | As it may happens that the codemirror content flows underneath the status bar, this patch should help to avoid it. It adds the size of the status bar as margin-bottom so the codemirror window itself is forced above the statusbar. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #82 from SISheogorath/fix/doubleCountSheogorath2019-05-261-0/+3
|\ \ | | | | | | Fix missing pictures for OpenID
| * | Fix missing pictures for OpenIDSheogorath2019-05-261-0/+3
| |/ | | | | | | | | | | | | | | | | | | Currently a problem appears when using OpenID for authentication as there is no method to add a profile picture right now. This patch makes sure that all undefined login methods get a profile picture. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #83 from SISheogorath/language/vietnameseSheogorath2019-05-263-1/+123
|\ \ | | | | | | Add vietnamese language
| * | Add vietnamese languageSheogorath2019-05-263-1/+123
|/ / | | | | | | | | | | | | | | There was some awesome work by Hồng in the recent days who translated CodiMD completely into Vietnamese language! This patch provides this awesome contributions. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #6 from SISheogorath/feautre/notTooBusySheogorath2019-05-255-0/+9
|\ \ | | | | | | Add config for toobusy middleware
| * | Add config for toobusy middlewareSheogorath2019-05-255-0/+9
|/ / | | | | | | | | | | | | | | | | | | With very low CPU frequency or bad IO situation, as well as not-loaded JS CodiMD happens to present unneeded "I'm busy"-messages to users. This patch allows to configure the lag. The default is taken from the libray but set in our own default configs. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #77 from SISheogorath/fix/scrollingSheogorath2019-05-251-0/+8
|\ \ | |/ |/| Fix hidden header on link
| * Fix hidden header on linkSheogorath2019-05-241-0/+8
|/ | | | | | | | | | | | | | | | | When people link a section or use the ToC to scroll to it upwards, it happens that those become hidden behind the navbar. This patch adds a little hack from StackOverflow[1] in order to fix this problem. By adding a pseudo element in front of any field that contains an id, it's possible to add the needed space. There was no negative impact found except of marking around the header areas in the rendered view requires a bit preciser work. This needs some more detailed testing. [1]: https://stackoverflow.com/a/24298427 Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #73 from Amolith/masterSheogorath2019-05-202-2/+5
|\ | | | | fix issues #70 and #72
| * remove single quote preceding mastodon linkAmolith2019-05-201-1/+1
| | | | | | | | Signed-off-by: Amolith <amolith@nixnet.xyz>
| * add mastodon link to index - complete #70Amolith2019-05-191-1/+1
| | | | | | | | Signed-off-by: Amolith <amolith@nixnet.xyz>
| * add mastodon badge - partially fix #70Amolith2019-05-191-0/+3
| | | | | | | | Signed-off-by: Amolith <amolith@nixnet.xyz>
| * fix issue 72Amolith2019-05-191-1/+1
|/ | | | Signed-off-by: Amolith <amolith@nixnet.xyz>
* Update es.json (POEditor.com)Christoph (Sheogorath) Kern2019-05-171-103/+120
|
* Merge branch 'feature/drop-node-6'Claudius2019-05-147-48/+134
|\
| * travis config is now in stagesClaudius2019-05-131-28/+18
| | | | | | | | Signed-off-by: Claudius <opensource@amenthes.de>
| * updating travis config: readable job names, more recent distroClaudius2019-05-131-7/+17
| | | | | | | | Signed-off-by: Claudius <opensource@amenthes.de>
| * drop node 6 supportClaudius2019-05-134-8/+8
| | | | | | | | | | | | | | | | We will no longer test on node6 and instead focus on 8+. This won't break node6 immediately, but we will no longer go out of our way supporting a version that does not receive security updates. Signed-off-by: Claudius <opensource@amenthes.de>
| * polyfilling scrypt for node 8.5+Claudius2019-05-133-5/+15
| | | | | | | | Signed-off-by: Claudius <opensource@amenthes.de>
| * asyncified setting and verifying the passwordClaudius2019-05-135-18/+48
| | | | | | | | Signed-off-by: Claudius <opensource@amenthes.de>
| * getting password hashing into a hook where it could be asyncClaudius2019-05-131-6/+14
| | | | | | | | Signed-off-by: Claudius <opensource@amenthes.de>
| * Adding the first few lines of user model testClaudius2019-05-132-1/+39
|/ | | | Signed-off-by: Claudius <opensource@amenthes.de>
* Merge pull request #44 from pferreir/fix-23Claudius Coenen2019-05-127-69/+55
|\ | | | | Fix toolbar day mode and upload button
| * Remove sass-loader, to avoid confusionPedro Ferreira2019-05-121-12/+0
| | | | | | | | Signed-off-by: Pedro Ferreira <pedro@dete.st>
| * Add no-console as a warningPedro Ferreira2019-05-121-0/+1
| | | | | | | | Signed-off-by: Pedro Ferreira <pedro@dete.st>
| * Fix toolbar day modePedro Ferreira2019-05-125-54/+51
| | | | | | | | | | | | Also moved the code to SCSS Signed-off-by: Pedro Ferreira <pedro@dete.st>
| * Make upload button respect night modePedro Ferreira2019-05-122-4/+4
|/ | | | | | | Also set a title in the input field, so that the file name doesn't show up. Signed-off-by: Pedro Ferreira <pedro@dete.st>
* Merge pull request #57 from boardfish/patch-1Christoph (Sheogorath) Kern2019-05-111-0/+50
|\ | | | | Provide documentation for configuration with Keycloak
| * Improve documentationSimon Fish2019-05-061-16/+27
| | | | | | | | Signed-off-by: Simon Fish <si@mon.fish>
| * Provide documentation for configuration with KeycloakSimon Fish2019-05-061-0/+39
|/ | | | Signed-off-by: Simon Fish <si@mon.fish>