Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #661 from edoardoo/darkTheme | Christoph (Sheogorath) Kern | 2018-01-16 | 9 | -12/+199 |
|\ | | | | | Implemented dark theme. | ||||
| * | :sparkles: Implemented dark theme. | Edoardo Odorico | 2018-01-05 | 9 | -12/+199 |
|/ | | | | Signed-off-by: Edoardo Odorico <edoubuntu@gmail.com> | ||||
* | Merge pull request #656 from PeterDaveHello/fix-file-permission | Christoph (Sheogorath) Kern | 2017-12-14 | 5 | -0/+0 |
|\ | | | | | Fix file permission, remove useless executable | ||||
| * | Fix file permission, remove useless executable | Peter Dave Hello | 2017-12-14 | 5 | -0/+0 |
|/ | |||||
* | Merge pull request #650 from LukasKalbertodt/ldap-username-field | Christoph (Sheogorath) Kern | 2017-12-12 | 5 | -1/+11 |
|\ | | | | | Add setting `ldap.usernameField` | ||||
| * | Merge branch 'master' into ldap-username-field | Christoph (Sheogorath) Kern | 2017-12-12 | 4 | -8/+15 |
| |\ | |||||
| * | | Add setting `ldap.usernameField` | Lukas Kalbertodt | 2017-12-09 | 5 | -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/master | Christoph (Sheogorath) Kern | 2017-12-12 | 1 | -3/+3 |
|\ \ \ | |_|/ |/| | | Correcting grammatical errors related to the document char count tooltip | ||||
| * | | Merge pull request #1 from monoxane/monoxane-patch-1 | Oliver Herrmann | 2017-10-30 | 1 | -3/+3 |
| |\ \ | | | | | | | | | Corrected some grammatical issues with document length limits. | ||||
| | * | | Corrected some grammatical issues | Oliver Herrmann | 2017-10-30 | 1 | -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-fix | Christoph (Sheogorath) Kern | 2017-12-12 | 4 | -7/+14 |
|\ \ \ | | | | | | | | | Parse env var `HMD_LDAP_SEARCHATTRIBUTES` as a comma-separated array | ||||
| * | | | parse HMD_LDAP_SEARCHATTRIBUTES env var as a comma-separated array | alecdwm | 2017-12-09 | 4 | -7/+14 |
|/ / / | | | | | | | | | | Signed-off-by: Alec WM <firstcontact@owls.io> | ||||
* | / | Update README.md | Christoph (Sheogorath) Kern | 2017-12-09 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #578 from hackmdio/licenseChangeAgreement | Max Wu | 2017-12-07 | 6 | -58/+1687 |
|\ \ | | | | | | | License Change Agreement | ||||
| * | | Update license field in package.json | Wu Cheng-Han | 2017-10-13 | 1 | -1/+1 |
| | | | |||||
| * | | Update contributing guide for signed-off and DCO | Wu Cheng-Han | 2017-10-12 | 1 | -5/+5 |
| | | | |||||
| * | | Fix typo | Wu Cheng-Han | 2017-10-12 | 1 | -1/+1 |
| | | | |||||
| * | | Change license from MIT to AGPLv3 | Wu Cheng-Han | 2017-10-12 | 1 | -17/+656 |
| | | | |||||
| * | | Update authors list and add contributors file | Wu Cheng-Han | 2017-10-12 | 2 | -35/+971 |
| | | | |||||
| * | | Add sign you work section in contributing and DCO | Wu Cheng-Han | 2017-10-12 | 2 | -0/+54 |
| | | | |||||
* | | | Merge pull request #633 from nakaeeee/saml-auth | Christoph (Sheogorath) Kern | 2017-12-04 | 19 | -4/+306 |
|\ \ \ | | | | | | | | | Support SAML authentication | ||||
| * | | | added guide for SAML settings | Norihito Nakae | 2017-12-04 | 12 | -6/+136 |
| | | | | |||||
| * | | | added environment variables for SAML | Norihito Nakae | 2017-11-29 | 2 | -1/+22 |
| | | | | |||||
| * | | | fixed the SAML callback URL to unconfigurable. | Norihito Nakae | 2017-11-29 | 3 | -3/+1 |
| | | | | |||||
| * | | | Initial support for SAML authentication | Norihito Nakae | 2017-11-28 | 12 | -4/+157 |
| | | | | |||||
* | | | | Merge pull request #646 from SISheogorath/fix/CI | Christoph (Sheogorath) Kern | 2017-12-04 | 1 | -2/+3 |
|\ \ \ \ | | | | | | | | | | | Fix build problem by updating yarn version | ||||
| * | | | | Fix build problem by updating yarn version | Sheogorath | 2017-12-04 | 1 | -2/+3 |
|/ / / / | |||||
* | | | | Merge pull request #639 from mosterdt/master | Christoph (Sheogorath) Kern | 2017-12-03 | 3 | -2/+6 |
|\ \ \ \ | | | | | | | | | | | Fix small spelling mistake and add untranslated sentences to locale | ||||
| * | | | | close open tags | Thomas De Backer | 2017-12-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add untranslated sentences to locale | Thomas De Backer | 2017-11-30 | 3 | -2/+6 |
|/ / / / | |||||
* | | | | Merge pull request #631 from SISheogorath/update/yarn | Christoph (Sheogorath) Kern | 2017-11-27 | 1 | -70/+75 |
|\| | | | | | | | | | | | Update yarn | ||||
| * | | | Update yarn | Sheogorath | 2017-11-27 | 1 | -70/+75 |
|/ / / | |||||
* | | | Merge pull request #627 from SISheogorath/fix/XSS | Christoph (Sheogorath) Kern | 2017-11-24 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Prevent XSS vulnerbility by srcdoc in iframe | ||||
| * | | | Prevent XSS vul by srcdoc in iframe | Sheogorath | 2017-11-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #601 from devonJS/auth-docs | Christoph (Sheogorath) Kern | 2017-11-09 | 10 | -2/+85 |
|\ \ \ \ | |/ / / |/| | | | Added small guide for auth providers GitHub and Twitter | ||||
| * | | | added auth docs and images for GitHub and Twitter | Devon Jue | 2017-11-08 | 10 | -2/+85 |
|/ / / | |||||
* | | | Merge pull request #615 from PeterDaveHello/patch-1 | Sheogorath | 2017-10-31 | 1 | -5/+5 |
|\ \ \ | | | | | | | | | [README] Add icons to browser version support list | ||||
| * | | | [README] Add icons to browser version support list | Peter Dave Hello | 2017-10-31 | 1 | -5/+5 |
|/ / / | |||||
* | | | Merge pull request #614 from SISheogorath/fix/mattermostVar | Sheogorath | 2017-10-31 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Fix mattermost breaking notes | ||||
| * | | | Fix mattermost breaking notes | Sheogorath | 2017-10-31 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge pull request #604 from PeterDaveHello/refactor-TravisCI-config | Sheogorath | 2017-10-31 | 1 | -8/+33 |
|\ \ \ | | | | | | | | | Refactor travis ci config | ||||
| * | | | Add build, ShellCheck, doctoc & jsonlint test on Travis CI | Peter Dave Hello | 2017-10-29 | 1 | -0/+16 |
| | | | | |||||
| * | | | Use matrix(jobs) in .travis.yml | Peter Dave Hello | 2017-10-29 | 1 | -8/+17 |
| | | | | |||||
* | | | | Merge pull request #606 from DoubleMalt/feature/MattermostAuth | Sheogorath | 2017-10-31 | 14 | -13/+116 |
|\ \ \ \ | | | | | | | | | | | Add Mattermost authentication strategy | ||||
| * | | | | Add mattermost authentication | Christoph Witzany | 2017-10-31 | 14 | -13/+116 |
| | | | | | |||||
* | | | | | Merge pull request #613 from SISheogorath/fix/allowerrorHandling | Sheogorath | 2017-10-31 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix allowpdfexport handling on error page | ||||
| * | | | | | Fix allowpdfexport handling on error page | Sheogorath | 2017-10-31 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #605 from SISheogorath/feature/extentReadme | Sheogorath | 2017-10-30 | 1 | -3/+18 |
|\ \ \ \ \ | |/ / / / |/| | | | | Extend docker section in README | ||||
| * | | | | Extend docker section | Sheogorath | 2017-10-30 | 1 | -3/+18 |
| | | | | | |||||
* | | | | | Merge pull request #612 from SISheogorath/fix/mermaidErr | Sheogorath | 2017-10-30 | 1 | -2/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix mermaid error handling Fixes #610 |