summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix file permission, remove useless executablePeter Dave Hello2017-12-145-0/+0
|
* Merge pull request #650 from LukasKalbertodt/ldap-username-fieldChristoph (Sheogorath) Kern2017-12-125-1/+11
|\ | | | | Add setting `ldap.usernameField`
| * Merge branch 'master' into ldap-username-fieldChristoph (Sheogorath) Kern2017-12-124-8/+15
| |\
| * | Add setting `ldap.usernameField`Lukas Kalbertodt2017-12-095-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | This determines which ldap field is used as the username on HackMD. By default, the "id" is used as username, too. The id is taken from the fields `uidNumber`, `uid` or `sAMAccountName`. To give the user more flexibility, they can now choose the field used for the username instead.
* | | Merge pull request #609 from monoxane/masterChristoph (Sheogorath) Kern2017-12-121-3/+3
|\ \ \ | |_|/ |/| | Correcting grammatical errors related to the document char count tooltip
| * | Merge pull request #1 from monoxane/monoxane-patch-1Oliver Herrmann2017-10-301-3/+3
| |\ \ | | | | | | | | Corrected some grammatical issues with document length limits.
| | * | Corrected some grammatical issuesOliver Herrmann2017-10-301-3/+3
| |/ / | | | | | | Obviously caught up in a bad translation and didn't particularly make sense for native english speakers.
* | | Merge pull request #651 from alecdwm/ldap-auth-searchattributes-fixChristoph (Sheogorath) Kern2017-12-124-7/+14
|\ \ \ | | | | | | | | Parse env var `HMD_LDAP_SEARCHATTRIBUTES` as a comma-separated array
| * | | parse HMD_LDAP_SEARCHATTRIBUTES env var as a comma-separated arrayalecdwm2017-12-094-7/+14
|/ / / | | | | | | | | | Signed-off-by: Alec WM <firstcontact@owls.io>
* | / Update README.mdChristoph (Sheogorath) Kern2017-12-091-1/+1
| |/ |/|
* | Merge pull request #578 from hackmdio/licenseChangeAgreementMax Wu2017-12-076-58/+1687
|\ \ | | | | | | License Change Agreement
| * | 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
|\ \ \ | | | | | | | | Support SAML authentication
| * | | 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 version
| * | | | Fix build problem by updating yarn versionSheogorath2017-12-041-2/+3
|/ / / /
* | | | 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