Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #771 from SISheogorath/refactor/imageRouter | Christoph (Sheogorath) Kern | 2018-03-21 | 1 | -0/+7 |
|\ | | | | | Refactoring imageRouter to modularity | ||||
| * | Refactoring imageRouter to modularity | Sheogorath | 2018-03-20 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make the imageRouter more modular and easier to extent. Also a lot of code duplication was removed which should simplify maintenance in future. In the new setup we only need to provide a new module file which exports a function called `uploadImage` and takes a filePath and a callback as argument. The callback itself takes an error and an url as parameter. This eliminates the need of a try-catch-block around the statement and re-enabled the optimization in NodeJS. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | ||||
* | | Add helper function to fix number problems | Sheogorath | 2018-03-16 | 2 | -3/+10 |
|/ | | | | | | | | | As minio causes various problem if you configure it using environment variables and leave the port setting out, which will evaluate to NaN, this change should fix this in a clean way for this time and helps to support numbers in general in future. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | ||||
* | Merge pull request #761 from SISheogorath/feature/reportURI | Christoph (Sheogorath) Kern | 2018-03-14 | 2 | -2/+4 |
|\ | | | | | Add config option for report URI in CSP | ||||
| * | Add config option for report URI in CSP | Sheogorath | 2018-03-14 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | This option is needed as it's currently not possible to add an report URI by the directives array. This option also allows to get CSP reports not only on docker based setup but also on our heroku instances. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | ||||
* | | Convert HMD_MINIO_PORT into Number type. | vazontang | 2018-03-15 | 1 | -1/+1 |
|/ | | | | | fix hackmdio/hackmd#763 Signed-off-by: Tang TsungYi <vazontang@gmail.com> | ||||
* | Remove unused LDAP option `tokenSecret` | Felix Schäfer | 2018-03-05 | 2 | -2/+0 |
| | | | | | | hackmdio/hackmd#754 Signed-off-by: Felix Schäfer <felix@thegcat.net> | ||||
* | Introduce ldap.useridField | Dustin Frisch | 2018-03-01 | 2 | -0/+2 |
| | | | | Signed-off-by: Dustin Frisch <fooker@lab.sh> | ||||
* | Remove camel case from `imageuploadtype` in config | Sheogorath | 2018-01-27 | 3 | -4/+12 |
| | | | | | | | | | | | | | This removes the only camel cased option of the config options **we** added to the config.json. In auth provider's config parts are a lot of camel cased options provided. We shouldn't touch them to keep them as similar as possible to the examples. Fixes #315 Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | ||||
* | Merge pull request #691 from SISheogorath/feature/upload | Christoph (Sheogorath) Kern | 2018-01-23 | 1 | -0/+20 |
|\ | | | | | Allow more detailed configuration of upload mime types | ||||
| * | Allow more detailed configuration of upload mime types | Sheogorath | 2018-01-20 | 1 | -0/+20 |
| | | | | | | | | | | | | Fixes #637 Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | ||||
* | | Fix broken port config | Sheogorath | 2018-01-23 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | ||||
* | | Merge pull request #506 from erasys/minio | Christoph (Sheogorath) Kern | 2018-01-23 | 2 | -0/+14 |
|\ \ | | | | | | | Add support for minio | ||||
| * | | Add support for minio | Marc Deop | 2017-08-30 | 2 | -0/+14 |
| | | | |||||
* | | | Merge pull request #598 from xxyy/feature/csp | Christoph (Sheogorath) Kern | 2018-01-22 | 2 | -0/+10 |
|\ \ \ | | | | | | | | | Implement basic CSP support | ||||
| * | | | Change CSP config format to be more intuitive | Literallie | 2017-10-22 | 2 | -9/+4 |
| | | | | |||||
| * | | | CSP: Allow more content types | Literallie | 2017-10-22 | 1 | -3/+7 |
| | | | | |||||
| * | | | CSP: Upgrade insecure requests if possible | Literallie | 2017-10-22 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | Config option; default is to only upgrade if usessl | ||||
| * | | | Add basic CSP support | Literallie | 2017-10-22 | 1 | -0/+10 |
| | | | | |||||
* | | | | Add option to enable `freely` permission in closed instance | Dario Ernst | 2018-01-20 | 3 | -1/+3 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | Before, closed disallowed guest edits completely, by removing the `freely` permission. This makes it possible to explicitely bring back guest-editing, but not guest-note-creation, to closed instances. Signed-off-by: Dario Ernst <dario@kanojo.de> | ||||
* | | | Merge pull request #686 from SISheogorath/feature/configVersion | Christoph (Sheogorath) Kern | 2018-01-19 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Load version from package.json | ||||
| * | | | Load version from package.json | Sheogorath | 2018-01-19 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | ||||
* | | | | Fix not passing app key correctly in dropbox config | Wu Cheng-Han | 2018-01-19 | 3 | -3/+6 |
|/ / / | |||||
* | | | Release 1.0.0-ce | Sheogorath | 2018-01-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #636 from laysdra7265/fix/sslcapath | Christoph (Sheogorath) Kern | 2018-01-18 | 2 | -2/+5 |
|\ \ \ | | | | | | | | | Fix sslcapath bug | ||||
| * | | | Update index.js | Christoph (Sheogorath) Kern | 2017-12-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Simplify loop | Christoph (Sheogorath) Kern | 2017-12-22 | 1 | -8/+3 |
| | | | | |||||
| * | | | fixed sslcapath bug | LaysDragon | 2017-12-05 | 2 | -2/+10 |
| | | | | |||||
* | | | | Merge branch 'master' into ldap-username-field | Christoph (Sheogorath) Kern | 2017-12-12 | 2 | -5/+12 |
|\ \ \ \ | |||||
| * | | | | parse HMD_LDAP_SEARCHATTRIBUTES env var as a comma-separated array | alecdwm | 2017-12-09 | 2 | -5/+12 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alec WM <firstcontact@owls.io> | ||||
* | | | | | Add setting `ldap.usernameField` | Lukas Kalbertodt | 2017-12-09 | 2 | -0/+2 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | added guide for SAML settings | Norihito Nakae | 2017-12-04 | 2 | -2/+0 |
| | | | | |||||
* | | | | added environment variables for SAML | Norihito Nakae | 2017-11-29 | 1 | -1/+12 |
| | | | | |||||
* | | | | fixed the SAML callback URL to unconfigurable. | Norihito Nakae | 2017-11-29 | 1 | -1/+0 |
| | | | | |||||
* | | | | Initial support for SAML authentication | Norihito Nakae | 2017-11-28 | 3 | -0/+21 |
|/ / / | |||||
* | | | Add mattermost authentication | Christoph Witzany | 2017-10-31 | 4 | -0/+15 |
| | | | |||||
* | | | Adds PDF export via config | geekyd | 2017-10-25 | 3 | -3/+7 |
|/ / | |||||
* | | Add env vars for extra HSTS options | Literallie | 2017-10-13 | 1 | -0/+3 |
| | | |||||
* | | Add on/off env var for HSTS | Literallie | 2017-10-13 | 1 | -0/+3 |
| | | |||||
* | | Make HSTS behaviour configurable; Fixes #584 | Literallie | 2017-10-13 | 1 | -0/+6 |
| | | |||||
* | | Fix missing boolean setting for HMD_URL_ADDPORT | Sheogorath | 2017-10-11 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> | ||||
* | Read to correct tlsca file path | tkykm | 2017-06-01 | 1 | -2/+2 |
| | |||||
* | fix(config): ssl environment configs not parse properly | Raccoon Li | 2017-05-08 | 3 | -7/+20 |
| | |||||
* | fix(config): some environment config not parse properly | Raccoon Li | 2017-05-08 | 2 | -7/+7 |
| | |||||
* | refactor(config.js): Extract config file | BoHong Li | 2017-05-08 | 7 | -0/+360 |
* Separate different config source to each files * Freeze config object |