summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1058 from ccoenen/bug/oauth2internalerrorChristoph (Sheogorath) Kern2018-11-161-4/+4
|\
| * InternalOAuthError is not part of passport, but of passport-oauth2Claudius Coenen2018-11-141-4/+4
* | Merge pull request #1057 from ccoenen/eslintChristoph (Sheogorath) Kern2018-11-1613-44/+75
|\ \
| * | switching to eslint for code checkingClaudius Coenen2018-11-1413-44/+75
|/ /
* | Merge pull request #1055 from SISheogorath/upgrade/winstonChristoph (Sheogorath) Kern2018-11-147-17/+25
|\ \
| * | Upgrade winstonSheogorath2018-11-147-17/+25
* | | Merge pull request #1047 from SISheogorath/docs/slideModeChristoph (Sheogorath) Kern2018-11-143-15/+29
|\ \ \ | |_|/ |/| |
| * | Add documentation for slide view mode to features pageSheogorath2018-11-141-1/+3
| * | Some minor improvements to the yaml-metadata docsSheogorath2018-11-141-15/+15
| * | Add documentation for type fieldSheogorath2018-11-141-0/+11
| * | Activate slide editing mode for exampleSheogorath2018-11-141-0/+1
| |/
* | Merge pull request #1054 from SISheogorath/fix/otLoggingChristoph (Sheogorath) Kern2018-11-131-5/+5
|\ \ | |/ |/|
| * Fix logging in ot moduleSheogorath2018-11-131-5/+5
|/
* Merge pull request #1027 from asg017/masterChristoph (Sheogorath) Kern2018-11-121-0/+3
|\
| * forgot break statementAlex Garcia2018-10-271-0/+1
| * Add download action to published notesAlex Garcia2018-10-271-0/+2
* | Merge pull request #983 from SISheogorath/fix/disableIndexesChristoph (Sheogorath) Kern2018-11-121-1/+1
|\ \
| * | Enforce disabled index for static assetsSheogorath2018-11-121-1/+1
|/ /
* | Merge pull request #1028 from SISheogorath/docs/editorModesChristoph (Sheogorath) Kern2018-11-121-2/+16
|\ \
| * | Add documentation about editor modes in features pageSheogorath2018-10-281-2/+16
* | | Merge pull request #1048 from dsprenkels/etherpad-migration-guideChristoph (Sheogorath) Kern2018-11-121-0/+131
|\ \ \
| * | | Add an etherpad migration guideDaan Sprenkels2018-11-101-0/+131
* | | | Update yarn.lockSheogorath2018-11-121-26/+12
* | | | Merge pull request #1051 from SISheogorath/feature/fullversionChristoph (Sheogorath) Kern2018-11-121-1/+1
|\ \ \ \
| * | | | Fix wrong reading from commitSheogorath2018-11-121-1/+1
* | | | | Merge pull request #1046 from SISheogorath/feature/optimizeXSSChristoph (Sheogorath) Kern2018-11-113-10/+7
|\ \ \ \ \
| * | | | | Remove the xss library from webpackSheogorath2018-11-103-10/+7
| | |/ / / | |/| | |
* | | | | Merge pull request #961 from SISheogorath/feature/osTEMPChristoph (Sheogorath) Kern2018-11-112-1/+3
|\ \ \ \ \
| * | | | | Use OS based tmp dirSheogorath2018-10-312-1/+3
* | | | | | Merge pull request #991 from SISheogorath/feature/fullversionChristoph (Sheogorath) Kern2018-11-119-7/+52
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Add full version stringSheogorath2018-11-119-7/+52
|/ / / /
* | | | Merge pull request #1041 from micedre/export-menu-fixChristoph (Sheogorath) Kern2018-11-073-8/+15
|\ \ \ \
| * | | | Fix menu for github and dropboxCédric Couralet2018-11-073-5/+11
| * | | | Fix menu when gitlab is enabledCédric Couralet2018-11-072-6/+7
|/ / / /
* | | | Merge pull request #1033 from SISheogorath/fix/versionsChristoph (Sheogorath) Kern2018-11-061-4/+4
|\ \ \ \
| * | | | Upgrade some package versionsSheogorath2018-10-311-4/+4
* | | | | Merge pull request #1034 from SISheogorath/fix/emojiPluginChristoph (Sheogorath) Kern2018-11-061-7/+6
|\ \ \ \ \
| * | | | | Again: Replace emoji-plugin regexSheogorath2018-10-311-7/+6
* | | | | | Merge pull request #1035 from ccoenen/feature/global-site-layout-varsClaudius Coenen2018-11-0512-128/+103
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | removing global site layout vars from individual routers, putting them into a...Claudius2018-11-0312-128/+103
|/ / / / /
* | | | | Merge pull request #1030 from Eronana/patch-1Christoph (Sheogorath) Kern2018-10-311-37/+67
|\ \ \ \ \
| * | | | | feat(bin): ensure email existsErona2018-10-291-0/+4
| * | | | | feat(bin): add option --reset to reset user passwordErona2018-10-291-1/+21
| * | | | | refactor(bin): add function getPass in bin/manage_usersErona2018-10-291-8/+11
| * | | | | refactor(bin): eliminate `var` and use template string refactor string thingsErona2018-10-291-15/+16
| * | | | | refactor(bin): add function showUsage to refactor usage thingsErona2018-10-291-8/+7
| * | | | | refactor(bin): refactor check args in bin/manage_usersErona2018-10-291-14/+17
| | |/ / / | |/| | |
* | | | | Merge pull request #1031 from SISheogorath/fix/emojiPluginChristoph (Sheogorath) Kern2018-10-311-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * / / Fix emoji regexSheogorath2018-10-291-1/+1
|/ / /
* | | Update it.json (POEditor.com)Christoph (Sheogorath) Kern2018-10-281-1/+2