summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ldap-username-fieldChristoph (Sheogorath) Kern2017-12-124-8/+15
|\
| * Merge pull request #651 from alecdwm/ldap-auth-searchattributes-fixChristoph (Sheogorath) Kern2017-12-124-7/+14
| |\
| | * parse HMD_LDAP_SEARCHATTRIBUTES env var as a comma-separated arrayalecdwm2017-12-094-7/+14
| |/
| * Update README.mdChristoph (Sheogorath) Kern2017-12-091-1/+1
* | Add setting `ldap.usernameField`Lukas Kalbertodt2017-12-095-1/+11
|/
* Merge pull request #578 from hackmdio/licenseChangeAgreementMax Wu2017-12-076-58/+1687
|\
| * Update license field in package.jsonWu Cheng-Han2017-10-131-1/+1
| * Update contributing guide for signed-off and DCOWu Cheng-Han2017-10-121-5/+5
| * Fix typoWu Cheng-Han2017-10-121-1/+1
| * Change license from MIT to AGPLv3Wu Cheng-Han2017-10-121-17/+656
| * Update authors list and add contributors fileWu Cheng-Han2017-10-122-35/+971
| * Add sign you work section in contributing and DCOWu Cheng-Han2017-10-122-0/+54
* | Merge pull request #633 from nakaeeee/saml-authChristoph (Sheogorath) Kern2017-12-0419-4/+306
|\ \
| * | added guide for SAML settingsNorihito Nakae2017-12-0412-6/+136
| * | added environment variables for SAMLNorihito Nakae2017-11-292-1/+22
| * | fixed the SAML callback URL to unconfigurable.Norihito Nakae2017-11-293-3/+1
| * | Initial support for SAML authenticationNorihito Nakae2017-11-2812-4/+157
* | | Merge pull request #646 from SISheogorath/fix/CIChristoph (Sheogorath) Kern2017-12-041-2/+3
|\ \ \
| * | | Fix build problem by updating yarn versionSheogorath2017-12-041-2/+3
|/ / /
* | | Merge pull request #639 from mosterdt/masterChristoph (Sheogorath) Kern2017-12-033-2/+6
|\ \ \
| * | | 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 yarnSheogorath2017-11-271-70/+75
|/ /
* | Merge pull request #627 from SISheogorath/fix/XSSChristoph (Sheogorath) Kern2017-11-241-1/+1
|\ \
| * | 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 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 listPeter Dave Hello2017-10-311-5/+5
|/ /
* | Merge pull request #614 from SISheogorath/fix/mattermostVarSheogorath2017-10-311-0/+1
|\ \
| * | Fix mattermost breaking notesSheogorath2017-10-311-0/+1
|/ /
* | Merge pull request #604 from PeterDaveHello/refactor-TravisCI-configSheogorath2017-10-311-8/+33
|\ \
| * | 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 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