summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #639 from mosterdt/masterChristoph (Sheogorath) Kern2017-12-033-2/+6
|\ | | | | Fix small spelling mistake and add untranslated sentences to locale
| * close open tagsThomas De Backer2017-12-011-2/+2
| |
| * Add untranslated sentences to localeThomas De Backer2017-11-303-2/+6
|/
* Merge pull request #631 from SISheogorath/update/yarnChristoph (Sheogorath) Kern2017-11-271-70/+75
|\ | | | | Update yarn
| * Update yarnSheogorath2017-11-271-70/+75
|/
* Merge pull request #627 from SISheogorath/fix/XSSChristoph (Sheogorath) Kern2017-11-241-1/+1
|\ | | | | Prevent XSS vulnerbility by srcdoc in iframe
| * Prevent XSS vul by srcdoc in iframeSheogorath2017-11-241-1/+1
| |
* | Merge pull request #601 from devonJS/auth-docsChristoph (Sheogorath) Kern2017-11-0910-2/+85
|\ \ | |/ |/| Added small guide for auth providers GitHub and Twitter
| * added auth docs and images for GitHub and TwitterDevon Jue2017-11-0810-2/+85
|/
* Merge pull request #615 from PeterDaveHello/patch-1Sheogorath2017-10-311-5/+5
|\ | | | | [README] Add icons to browser version support list
| * [README] Add icons to browser version support listPeter Dave Hello2017-10-311-5/+5
|/
* Merge pull request #614 from SISheogorath/fix/mattermostVarSheogorath2017-10-311-0/+1
|\ | | | | Fix mattermost breaking notes
| * Fix mattermost breaking notesSheogorath2017-10-311-0/+1
|/
* Merge pull request #604 from PeterDaveHello/refactor-TravisCI-configSheogorath2017-10-311-8/+33
|\ | | | | Refactor travis ci config
| * Add build, ShellCheck, doctoc & jsonlint test on Travis CIPeter Dave Hello2017-10-291-0/+16
| |
| * Use matrix(jobs) in .travis.ymlPeter Dave Hello2017-10-291-8/+17
| |
* | Merge pull request #606 from DoubleMalt/feature/MattermostAuthSheogorath2017-10-3114-13/+116
|\ \ | | | | | | Add Mattermost authentication strategy
| * | Add mattermost authenticationChristoph Witzany2017-10-3114-13/+116
| | |
* | | Merge pull request #613 from SISheogorath/fix/allowerrorHandlingSheogorath2017-10-311-2/+2
|\ \ \ | | | | | | | | Fix allowpdfexport handling on error page
| * | | Fix allowpdfexport handling on error pageSheogorath2017-10-311-2/+2
| |/ /
* | | Merge pull request #605 from SISheogorath/feature/extentReadmeSheogorath2017-10-301-3/+18
|\ \ \ | |/ / |/| | Extend docker section in README
| * | Extend docker sectionSheogorath2017-10-301-3/+18
| | |
* | | Merge pull request #612 from SISheogorath/fix/mermaidErrSheogorath2017-10-301-2/+7
|\ \ \ | | | | | | | | | | | | | | | | Fix mermaid error handling Fixes #610
| * | | Fix mermaid error handlingSheogorath2017-10-301-2/+7
|/ / /
* | | Merge pull request #608 from SISheogorath/fix/mermaidSheogorath2017-10-301-12/+4
|\ \ \ | | | | | | | | Use mermaidAPI in mermaid scope
| * | | Use mermaidAPI in mermaid scopeSheogorath2017-10-301-12/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | Introduced by https://github.com/knsv/mermaid/commit/a5b71455271aef1180eefa1054d751dea1885e3f#diff-67ae90c5144c55348a3cbdb078240454L532 Fixes #600 Parse only throws error: https://github.com/knsv/mermaid/commit/167368d508f1e5b1606b2b45f892cdd60d479448#diff-67ae90c5144c55348a3cbdb078240454
* | | Merge pull request #607 from PeterDaveHello/upgrade-mermaidSheogorath2017-10-295-118/+241
|\ \ \ | |/ / |/| | Upgrade mermaid to v7.1.0, fix #600
| * | Update yarn.lockPeter Dave Hello2017-10-301-114/+237
| | |
| * | Upgrade mermaid to v7.1.0, fix #600Peter Dave Hello2017-10-304-4/+4
| |/
* | Merge pull request #462 from CrazyPython/patch-1Sheogorath2017-10-271-22/+22
|\ \ | |/ |/| Fix grammar and use best English standards
| * Update en.jsonJames2017-10-131-1/+1
| |
| * Update en.jsonJames2017-10-131-1/+1
| |
| * Merge pull request #1 from SISheogorath/patch-2James2017-09-111-5/+5
| |\ | | | | | | Update en.json
| | * Update en.jsonSheogorath2017-09-111-5/+5
| |/
| * Update en.jsonJames2017-09-071-4/+4
| |
| * Update en.jsonJames2017-09-071-1/+1
| |
| * Update en.jsonCrazyPython2017-05-251-1/+1
| |
| * file -> noteCrazyPython2017-05-251-1/+1
| |
| * Update en.jsonCrazyPython2017-05-191-2/+2
| |
| * Incorporate feedbackCrazyPython2017-05-191-2/+2
| |
| * This is a alert area -> this is an alert areaCrazyPython2017-05-171-1/+1
| |
| * "Todo List" -> "Checklist" and "Marked text" -> "Highlighted text"CrazyPython2017-05-161-3/+3
| |
| * "Collaborate with URL" sounds like a command to an English nativeCrazyPython2017-05-161-1/+1
| |
| * Fix grammar and use best English standardsCrazyPython2017-05-161-12/+12
| |
* | Merge pull request #599 from xxyy/fix/inline-stylesSheogorath2017-10-272-6/+23
|\ \ | | | | | | Externalise some trivial inline styles from slide.ejs
| * | Externalise trivial inline styles from slide.ejsLiterallie2017-10-232-6/+23
| | | | | | | | | | | | Dynamic background images need some further work
* | | Merge pull request #562 from SISheogorath/fix/LDAPSheogorath2017-10-271-2/+3
|\ \ \ | | | | | | | | Fix LDAP problem about missing uidNumber
| * | | Fix LDAP problem about missing uidNumberSheogorath2017-10-121-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Merge pull request #574 from PeterDaveHello/README.md-Table-of-ContentsSheogorath2017-10-272-60/+86
|\ \ \ \ | | | | | | | | | | Add "Table of Contents" in README.md
| * | | | Integrate npm package "doctoc" to update README.mdPeter Dave Hello2017-10-132-1/+7
| | | | |