summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1127 from SISheogorath/fix/unlinkFixChristoph (Sheogorath) Kern2019-01-251-1/+1
|\
| * Fix broken PDF export by wrong unlink callSheogorath2019-01-241-1/+1
|/
* Update yarn.lockSheogorath2019-01-241-135/+96
* Merge pull request #1125 from hackmdio/dependency-node-6-fixClaudius Coenen2019-01-241-0/+3
|\
| * Fixing deep dependency problem with node 6.xClaudius Coenen2019-01-231-0/+3
|/
* Merge pull request #1124 from phrix32/patch-1Christoph (Sheogorath) Kern2019-01-221-1/+1
|\
| * Fix reference to SAML guide in READMEJonathan2019-01-221-1/+1
|/
* Merge pull request #1123 from SISheogorath/fix/lintingTestsChristoph (Sheogorath) Kern2019-01-212-8/+10
|\
| * Add linting for testsSheogorath2019-01-212-8/+10
* | Merge pull request #1121 from SISheogorath/test/CSPChristoph (Sheogorath) Kern2019-01-212-0/+125
|\|
| * Add tests for csp.jsSheogorath2019-01-192-0/+125
|/
* Update yarn.lockSheogorath2019-01-181-504/+561
* Merge pull request #1116 from dsprenkels/manage_usersChristoph (Sheogorath) Kern2019-01-121-1/+1
|\
| * Fix broken manage_users after Winston upgradeDaan Sprenkels2019-01-101-1/+1
* | Merge pull request #1117 from SISheogorath/upgrade/bootstrapChristoph (Sheogorath) Kern2019-01-127-9/+9
|\ \ | |/ |/|
| * Update bootstrap from 3.3.7 to 3.4.0Sheogorath2019-01-117-9/+9
|/
* Merge pull request #1114 from SISheogorath/fix/samlVersionChristoph (Sheogorath) Kern2019-01-091-1/+1
|\
| * Update SAML to version 1.0.0Sheogorath2019-01-091-1/+1
|/
* Merge pull request #1110 from dsprenkels/issue_1106Christoph (Sheogorath) Kern2019-01-053-5/+20
|\
| * Remove blueimp-md5 dependencyDaan Sprenkels2018-12-222-4/+7
| * Add a test for gravatar urlsDaan Sprenkels2018-12-222-1/+13
* | Merge pull request #1112 from hackmdio/fix-XSS-issuesChristoph (Sheogorath) Kern2018-12-292-2/+2
|\ \ | |/ |/|
| * Fix to escape html comment tag [Security Issue]Max Wu2018-12-281-1/+1
| * Fix to sanitize disqus shortnames to remove slashes [Security Issue]Max Wu2018-12-281-1/+1
|/
* Merge pull request #1105 from SISheogorath/fix/gistCSPChristoph (Sheogorath) Kern2018-12-211-1/+1
|\
| * Fix broken Gist embeddingSheogorath2018-12-201-1/+1
* | Merge pull request #1108 from dsprenkels/patch-1Christoph (Sheogorath) Kern2018-12-211-1/+1
|\ \
| * | Update upload provider error messageDaan Sprenkels2018-12-211-1/+1
|/ /
* | Merge pull request #1103 from SISheogorath/fix/localImageUploadChristoph (Sheogorath) Kern2018-12-201-2/+2
|\ \
| * | Fix usage of new URL APISheogorath2018-12-181-2/+2
| |/
* | Update ru.json (POEditor.com)Christoph (Sheogorath) Kern2018-12-131-103/+116
* | Merge pull request #1091 from SISheogorath/fix/speakerNotesCSPChristoph (Sheogorath) Kern2018-12-061-1/+1
|\ \
| * | Fix CSP for speaker notesSheogorath2018-12-051-1/+1
| |/
* | Merge pull request #1092 from SISheogorath/fix/disqusCSPChristoph (Sheogorath) Kern2018-12-061-1/+1
|\ \ | |/ |/|
| * Fix disqus CSPSheogorath2018-12-051-1/+1
|/
* Update yarn.lockSheogorath2018-12-041-362/+499
* Merge pull request #1085 from SISheogorath/update/socket.ioChristoph (Sheogorath) Kern2018-12-012-3/+3
|\
| * Update socket.ioSheogorath2018-11-282-3/+3
* | Merge pull request #1086 from SISheogorath/feature/urlWarningChristoph (Sheogorath) Kern2018-12-011-0/+4
|\ \
| * | Warn on missing serverURLSheogorath2018-11-281-0/+4
| |/
* | Merge pull request #1082 from cloudyu/pullChristoph (Sheogorath) Kern2018-11-282-4/+4
|\ \ | |/ |/|
| * Fix typoCloudYu2018-11-272-4/+4
* | Merge pull request #1084 from dsprenkels/export-subdirsChristoph (Sheogorath) Kern2018-11-281-9/+11
|\ \ | |/ |/|
| * Prevent subdirectories in user exportDaan Sprenkels2018-11-281-9/+11
|/
* Merge pull request #1072 from SISheogorath/update/doctocChristoph (Sheogorath) Kern2018-11-241-1/+1
|\
| * Update doctoc to version 1.4.0Sheogorath2018-11-211-1/+1
* | Merge pull request #1069 from SISheogorath/fix/to-markdownChristoph (Sheogorath) Kern2018-11-242-3/+8
|\ \
| * | Update from to-markdown to turndownSheogorath2018-11-212-3/+8
* | | Merge pull request #1071 from SISheogorath/fix/node-uuidChristoph (Sheogorath) Kern2018-11-241-1/+0
|\ \ \
| * | | Remove node-uuidSheogorath2018-11-211-1/+0
| | |/ | |/|