summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #606 from DoubleMalt/feature/MattermostAuthSheogorath2017-10-3114-13/+116
|\
| * 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 pageSheogorath2017-10-311-2/+2
| |/
* | Merge pull request #605 from SISheogorath/feature/extentReadmeSheogorath2017-10-301-3/+18
|\ \ | |/ |/|
| * Extend docker sectionSheogorath2017-10-301-3/+18
* | Merge pull request #612 from SISheogorath/fix/mermaidErrSheogorath2017-10-301-2/+7
|\ \
| * | Fix mermaid error handlingSheogorath2017-10-301-2/+7
|/ /
* | Merge pull request #608 from SISheogorath/fix/mermaidSheogorath2017-10-301-12/+4
|\ \
| * | Use mermaidAPI in mermaid scopeSheogorath2017-10-301-12/+4
|/ /
* | Merge pull request #607 from PeterDaveHello/upgrade-mermaidSheogorath2017-10-295-118/+241
|\ \ | |/ |/|
| * 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
|\ \ | |/ |/|
| * 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.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 trivial inline styles from slide.ejsLiterallie2017-10-232-6/+23
* | | Merge pull request #562 from SISheogorath/fix/LDAPSheogorath2017-10-271-2/+3
|\ \ \
| * | | Fix LDAP problem about missing uidNumberSheogorath2017-10-121-2/+3
* | | | Merge pull request #574 from PeterDaveHello/README.md-Table-of-ContentsSheogorath2017-10-272-60/+86
|\ \ \ \
| * | | | Integrate npm package "doctoc" to update README.mdPeter Dave Hello2017-10-132-1/+7
| * | | | Add "Table of Contents" in README.mdPeter Dave Hello2017-10-131-0/+21
| * | | | Reorganize README.md structure, cc #574Peter Dave Hello2017-10-131-59/+58
* | | | | Merge pull request #589 from geekyd/masterSheogorath2017-10-257-10/+30
|\ \ \ \ \
| * | | | | Adds 403 response if PDF export is disabledgeekyd2017-10-251-1/+6
| * | | | | Adds HMD_ALLOW_PDF_EXPORT to readmegeekyd2017-10-251-1/+2
| * | | | | Adds PDF export via configgeekyd2017-10-256-8/+22
|/ / / / /
* | | | | Merge pull request #591 from Rwing/masterSheogorath2017-10-236-106/+215
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | support Simplified Chinese and rename original zh to Traditional ChineseRwing2017-10-236-106/+215
* | | | | Merge pull request #597 from hackmdio/fix-gist-tag-structureSheogorath2017-10-211-1/+1
|\ \ \ \ \
| * | | | | Fix markdown-it gist plugin code closing tagYukai Huang2017-10-211-1/+1
|/ / / / /
* | | | | Merge pull request #595 from geekyd/swapSheogorath2017-10-191-0/+4
|\ \ \ \ \
| * | | | | Hides empty export sectiongeekyd2017-10-181-0/+4
* | | | | | Merge pull request #586 from PeterDaveHello/jsonlintSheogorath2017-10-181-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add jsonlint script to ensure all json files are validPeter Dave Hello2017-10-141-1/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #593 from felixonmars/patch-1Sheogorath2017-10-171-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix a typo in README.mdFelix Yan2017-10-171-1/+1
|/ / / /