summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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>
* Update jQuery to version 3.4.1Sheogorath2019-05-067-230/+28
|
* Merge pull request #61 from archemiro/archemiro/docs-setup-dockerChristoph (Sheogorath) Kern2019-05-061-1/+1
|\ | | | | Add name of directory to clone into
| * Add name of directory to clone intoMauricio Robayo2019-05-051-1/+1
|/ | | | Signed-off-by: Mauricio Robayo <rfmajo@gmail.com>
* Update sv.json (POEditor.com)Christoph (Sheogorath) Kern2019-04-251-103/+120
|
* Update de.json (POEditor.com)Christoph (Sheogorath) Kern2019-04-201-1/+1
|
* Update de.json (POEditor.com)Christoph (Sheogorath) Kern2019-04-191-1/+5
|
* Update zh-TW.json (POEditor.com)Christoph (Sheogorath) Kern2019-04-191-1/+5
|
* Update sr.json (POEditor.com)Christoph (Sheogorath) Kern2019-04-191-3/+5
|
* Update pl.json (POEditor.com)Christoph (Sheogorath) Kern2019-04-191-1/+3
|
* Update ja.json (POEditor.com)Christoph (Sheogorath) Kern2019-04-191-1/+3
|
* Update it.json (POEditor.com)Christoph (Sheogorath) Kern2019-04-191-1/+3
|
* Update fr.json (POEditor.com)Christoph (Sheogorath) Kern2019-04-191-1/+3
|
* Update zh-CN.json (POEditor.com)Christoph (Sheogorath) Kern2019-04-191-1/+3
|
* Merge pull request #51 from SISheogorath/fix/wurlChristoph (Sheogorath) Kern2019-04-195-9/+7
|\ | | | | Replace js-url with wurl
| * Replace js-url with wurlSheogorath2019-04-165-9/+7
| | | | | | | | | | | | | | | | js-url is outdated and wurl is it's successor. This will fix some vulnerabilities in the dependencies and also optimize the build process by removing the external library toward internal tooling. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #52 from codimd/snyk-fix-yfvllfChristoph (Sheogorath) Kern2019-04-161-1/+1
|\ \ | | | | | | [Snyk] Fix for 1 vulnerable dependencies
| * | fix: package.json to reduce vulnerabilitiessnyk-bot2019-04-161-1/+1
|/ / | | | | | | | | The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-HANDLEBARS-174183
* | 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>