summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | 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
* | | | Update fr.json (POEditor.com)Christoph (Sheogorath) Kern2018-10-281-3/+4
| |/ / |/| |
* | | Merge pull request #997 from SISheogorath/docs/slidePrintChristoph (Sheogorath) Kern2018-10-221-1/+1
|\ \ \
| * | | slide example: Add link to slide printing instructionsSheogorath2018-10-071-1/+1
* | | | Merge pull request #1006 from SISheogorath/fix/missingEmojisChristoph (Sheogorath) Kern2018-10-221-0/+15
|\ \ \ \
| * | | | Fix not rendered autocomplete emojisSheogorath2018-10-101-0/+15
* | | | | Merge pull request #1021 from davidmehren/webpack-4Christoph (Sheogorath) Kern2018-10-191-15/+15
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Code style fixes for webpack.common.jsDavid Mehren2018-10-191-9/+9
| * | | | Use const instead of var in webpack configs.David Mehren2018-10-191-6/+6
|/ / / /
* | | | Merge pull request #1018 from SISheogorath/remove/gitterChristoph (Sheogorath) Kern2018-10-174-7/+5
|\ \ \ \
| * | | | Remove Gitter from codebaseSheogorath2018-10-174-7/+5
|/ / / /
* | | | Merge pull request #1017 from MartB/masterChristoph (Sheogorath) Kern2018-10-164-39/+48
|\ \ \ \
| * | | | Fix #1016: webpack include defect for scripts and header files.MartB2018-10-164-39/+48
|/ / / /
* | | | Update de.json (POEditor.com)Christoph (Sheogorath) Kern2018-10-150-0/+0
* | | | Update pl.json (POEditor.com)Christoph (Sheogorath) Kern2018-10-121-103/+114
* | | | Update fr.json (POEditor.com)Christoph (Sheogorath) Kern2018-10-121-103/+114
* | | | Merge pull request #1004 from SISheogorath/feature/integrateHljsChristoph (Sheogorath) Kern2018-10-111-1/+2
|\ \ \ \
| * | | | Add autocomplete for highlight.js languages into codemirrorSheogorath2018-10-101-1/+2
| |/ / /
* | | | Update yarn.lockSheogorath2018-10-111-16/+22
* | | | Merge pull request #985 from SISheogorath/fix/helmetCSPChristoph (Sheogorath) Kern2018-10-112-2/+2
|\ \ \ \
| * | | | Add `data:` URL to CSP and upgrade helmetSheogorath2018-10-042-2/+2