status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,795 Commits 23 Branches 35 Tags 26 MiB
Commit Graph

1795 Commits

Author SHA1 Message Date
Christoph (Sheogorath) Kern 17e3b8b5cd
Merge branch 'master' into ldap-username-field 2017-12-12 10:27:22 +01:00
Christoph (Sheogorath) Kern 74758723f9
Merge pull request #651 from alecdwm/ldap-auth-searchattributes-fix 
Parse env var `HMD_LDAP_SEARCHATTRIBUTES` as a comma-separated array
 2017-12-12 10:23:42 +01:00
alecdwm 5e5a021ce0 parse HMD_LDAP_SEARCHATTRIBUTES env var as a comma-separated array 
Signed-off-by: Alec WM <firstcontact@owls.io>
 2017-12-09 20:33:57 +01:00
Christoph (Sheogorath) Kern e9e7a8e23d
Update README.md 2017-12-09 19:36:18 +01:00
Lukas Kalbertodt 612b2d1811 Add setting `ldap.usernameField` 
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.
 2017-12-09 12:30:48 +01:00
Max Wu 1b7d621fd1
Merge pull request #578 from hackmdio/licenseChangeAgreement 
License Change Agreement
 2017-12-07 06:54:12 +08:00
LaysDragon 9949795533 fixed sslcapath bug 2017-12-05 12:06:10 +08:00
Christoph (Sheogorath) Kern 0957f5963b
Merge pull request #633 from nakaeeee/saml-auth 
Support SAML authentication
 2017-12-04 18:57:57 +01:00
Norihito Nakae 2db2ff484f added guide for SAML settings 2017-12-04 20:13:15 +09:00
Christoph (Sheogorath) Kern 8112cd6fef
Merge pull request #646 from SISheogorath/fix/CI 
Fix build problem by updating yarn version
 2017-12-04 02:58:35 +01:00
Sheogorath bb37ef87d5
Fix build problem by updating yarn version 2017-12-04 02:42:19 +01:00
Christoph (Sheogorath) Kern a0736f9a2e
Merge pull request #639 from mosterdt/master 
Fix small spelling mistake and add untranslated sentences to locale
 2017-12-03 21:05:50 +01:00
Thomas De Backer c60030b205 close open tags 2017-12-01 20:56:39 +01:00
Thomas De Backer 4eef4875ed Add untranslated sentences to locale 2017-11-30 19:02:40 +01:00
Norihito Nakae 410268da74 added environment variables for SAML 2017-11-29 20:26:28 +09:00
Norihito Nakae a22be81feb fixed the SAML callback URL to unconfigurable. 2017-11-29 15:45:32 +09:00
Norihito Nakae 4a4ae9d332 Initial support for SAML authentication 2017-11-28 18:52:24 +09:00
Christoph (Sheogorath) Kern f0bfa87fbf
Merge pull request #631 from SISheogorath/update/yarn 
Update yarn
 2017-11-27 08:27:57 +01:00
Sheogorath 9c002ce29b Update yarn 2017-11-27 08:14:28 +01:00
Christoph (Sheogorath) Kern 8ea09a8bd0
Merge pull request #627 from SISheogorath/fix/XSS 
Prevent XSS vulnerbility by srcdoc in iframe
 2017-11-24 18:09:41 +01:00
Sheogorath 93b91163cd
Prevent XSS vul by srcdoc in iframe 2017-11-24 10:10:50 +01:00
Christoph (Sheogorath) Kern 978ec84906
Merge pull request #601 from devonJS/auth-docs 
Added small guide for auth providers GitHub and Twitter
 2017-11-09 13:34:18 +01:00
Devon Jue 8c916bb987 added auth docs and images for GitHub and Twitter 2017-11-08 21:20:50 -08:00
Literallie 3a752fde51
Revert "Load js-url lib using legacy-loader" 
Didn't work in Firefox for some reason.

`[Script Loader] ReferenceError: module is not defined`

This reverts commit 5b83deb043.
 2017-11-02 17:57:44 +01:00
Sheogorath d8997f938b
Merge pull request #615 from PeterDaveHello/patch-1 
[README] Add icons to browser version support list
 2017-10-31 15:18:03 +01:00
Peter Dave Hello 05541f1546
[README] Add icons to browser version support list 2017-10-31 22:13:36 +08:00
Sheogorath 4c6e768a52
Merge pull request #614 from SISheogorath/fix/mattermostVar 
Fix mattermost breaking notes
 2017-10-31 14:16:06 +01:00
Sheogorath 8808399c48
Fix mattermost breaking notes 2017-10-31 13:48:35 +01:00
Sheogorath 66b3463825
Merge pull request #604 from PeterDaveHello/refactor-TravisCI-config 
Refactor travis ci config
 2017-10-31 12:12:33 +01:00
Sheogorath 16b3e015ab
Merge pull request #606 from DoubleMalt/feature/MattermostAuth 
Add Mattermost authentication strategy
 2017-10-31 12:11:41 +01:00
Christoph Witzany 5cda55086a Add mattermost authentication 2017-10-31 10:34:51 +01:00
Sheogorath f2812730e0
Merge pull request #613 from SISheogorath/fix/allowerrorHandling 
Fix allowpdfexport handling on error page
 2017-10-31 02:22:42 +01:00
Sheogorath ef49b72442
Fix allowpdfexport handling on error page 2017-10-31 01:57:32 +01:00
Sheogorath 6ca28845c2
Merge pull request #605 from SISheogorath/feature/extentReadme 
Extend docker section in README
 2017-10-30 23:04:13 +01:00
Sheogorath dad5798472
Merge pull request #612 from SISheogorath/fix/mermaidErr 
Fix mermaid error handling

Fixes #610
 2017-10-30 12:30:38 +01:00
Sheogorath e807f1b783
Fix mermaid error handling 2017-10-30 12:26:28 +01:00
Sheogorath 803a2776ad
Extend docker section 2017-10-30 07:50:50 +01:00
Sheogorath b3c66d4a10
Merge pull request #608 from SISheogorath/fix/mermaid 
Use mermaidAPI in mermaid scope
 2017-10-30 07:24:57 +01:00
Sheogorath 09d2ba41cf
Use mermaidAPI in mermaid scope 
Introduced by a5b7145527 (diff-67ae90c5144c55348a3cbdb078240454L532)

Fixes #600

Parse only throws error: 167368d508 (diff-67ae90c5144c55348a3cbdb078240454)
 2017-10-30 07:11:14 +01:00
Oliver Herrmann b7e87f7767
Merge pull request #1 from monoxane/monoxane-patch-1 
Corrected some grammatical issues with document length limits.
 2017-10-30 11:26:47 +11:00
Oliver Herrmann 7d0ef1276c
Corrected some grammatical issues 
Obviously caught up in a bad translation and didn't particularly make sense for native english speakers.
 2017-10-30 11:25:44 +11:00
Sheogorath f1475535a2
Merge pull request #607 from PeterDaveHello/upgrade-mermaid 
Upgrade mermaid to v7.1.0, fix #600
 2017-10-29 17:32:41 +01:00
Peter Dave Hello da2426ae3d Update yarn.lock 2017-10-30 00:21:35 +08:00
Peter Dave Hello f896432250 Upgrade mermaid to v7.1.0, fix #600 2017-10-30 00:18:53 +08:00
Peter Dave Hello 7478dd14e0 Add build, ShellCheck, doctoc & jsonlint test on Travis CI 2017-10-29 23:01:46 +08:00
Peter Dave Hello cae9bb2e7d Use matrix(jobs) in .travis.yml 2017-10-29 23:01:44 +08:00
Sheogorath 862545fff7
Merge pull request #462 from CrazyPython/patch-1 
Fix grammar and use best English standards
 2017-10-27 22:15:42 +02:00
Sheogorath abbc43f9b6 Merge pull request #599 from xxyy/fix/inline-styles 
Externalise some trivial inline styles from slide.ejs
 2017-10-27 13:24:26 +02:00
Sheogorath 881e800fd8 Merge pull request #562 from SISheogorath/fix/LDAP 
Fix LDAP problem about missing uidNumber
 2017-10-27 12:48:45 +02:00
Sheogorath 94021e2d34 Merge pull request #574 from PeterDaveHello/README.md-Table-of-Contents 
Add "Table of Contents" in README.md
 2017-10-27 11:51:50 +02:00