summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #837 from SISheogorath/translate/koreanChristoph (Sheogorath) Kern2018-06-073-1/+111
|\ | | | | Add korean translation
| * Add korean translationSheogorath2018-06-073-1/+111
| | | | | | | | | | | | | | | | This translation was contributed via POEditor by the user Basix. Thanks a lot for your work! Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #836 from SISheogorath/fix/i18n-filesChristoph (Sheogorath) Kern2018-06-072-1/+5
|\ \ | |/ |/| Fix i18n writing locale files in production
| * Fix i18n writing locale files in productionSheogorath2018-06-052-1/+5
| | | | | | | | | | | | | | | | This commit should prevent the i18n module from adding missing translations to the local files in setups that are not for development. This way we keep the directory clean and idempotent. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Update yarn.lockSheogorath2018-06-051-2/+194
|/ | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #784 from pferreir/add-oauth2-supportChristoph (Sheogorath) Kern2018-06-0410-6/+163
|\ | | | | Add "generic" OAuth2 support
| * Use TEXT instead of STRING for tokensPedro Ferreira2018-03-262-2/+25
| | | | | | | | Signed-off-by: Pedro Ferreira <pedro.ferreira@cern.ch>
| * Add support for generic OAuth2 providersPedro Ferreira2018-03-268-4/+138
| | | | | | | | Signed-off-by: Pedro Ferreira <pedro.ferreira@cern.ch>
* | Merge pull request #783 from SISheogorath/docs/splitAuthChristoph (Sheogorath) Kern2018-06-016-241/+243
|\ \ | | | | | | Split authentication guides into multiple documents
| * | Split authentication guides into multiple documentsSheogorath2018-06-016-241/+243
| | | | | | | | | | | | | | | | | | | | | | | | Splitting the documentation should provide an easier access to the documentation people searching for and result in less merge conflicts when adding new documentation here. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #833 from ahoka/callbackChristoph (Sheogorath) Kern2018-06-014-4/+7
|\ \ \ | |/ / |/| | Fix callback validation
| * | Fix callback validationAdam Hoka2018-06-014-4/+7
| | | | | | | | | | | | Signed-off-by: Adam Hoka <hoka.adam@nexogen.hu>
* | | Merge pull request #782 from SISheogorath/feature/showFullTitleChristoph (Sheogorath) Kern2018-06-011-1/+2
|\ \ \ | |/ / |/| | Add title attribute in table of contents
| * | Add title attribute in table of contentsSheogorath2018-03-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Right now the full title of an element is may not shown as the space of the ToC is limited. With this path it'll be shower on hover and this way provide more useful information. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #675 from ahoka/masterChristoph (Sheogorath) Kern2018-06-018-6/+60
|\ \ \ | | | | | | | | Add Azure Blob Storage support
| * | | Add Azure Blob Storage supportÁdám Hóka2018-06-018-6/+60
| | | | | | | | | | | | | | | | Signed-off-by: Adam Hoka <hoka.adam@nexogen.hu>
* | | | Merge pull request #832 from liuderchi/fix/checkbox-style-slide-modeChristoph (Sheogorath) Kern2018-05-311-1/+2
|\ \ \ \ | |/ / / |/| | | fix(slide): adjust checkbox size
| * | | fix(slide): adjust checkbox sizeliuderchi2018-05-311-1/+2
|/ / / | | | | | | | | | | | | | | | - to override rules in css/github-extract.css with `!important` already Signed-off-by: liuderchi <liuderchi@gmail.com>
* | | Merge pull request #785 from pferreir/redirect-to-loginChristoph (Sheogorath) Kern2018-05-311-1/+7
|\ \ \ | | | | | | | | 403: Redirect user to login page if not logged in
| * | | 403: redirect user to login page if not logged inPedro Ferreira2018-03-271-1/+7
| | |/ | |/| | | | | | | Signed-Off-By: Pedro Ferreira <pedro.ferreira@cern.ch>
* | | Release 1.1.1-ceSheogorath2018-05-231-1/+1
| | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #828 from SISheogorath/feature/release-notes-1.1.1-ceChristoph (Sheogorath) Kern2018-05-231-0/+21
|\ \ \ | | | | | | | | Add release notes for 1.1.1-ce
| * | | Add release notes for 1.1.1-ceSheogorath2018-05-221-0/+21
|/ / / | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Update yarn.lockSheogorath2018-05-211-3/+3
| | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Add current requirements for node versionsSheogorath2018-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | Right now we can only run on node versions below 10.x thanks to scrypt dependencies. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #826 from SISheogorath/upgrade/base64urlChristoph (Sheogorath) Kern2018-05-171-1/+1
|\ \ \ | | | | | | | | Upgrade base64url package
| * | | Upgrade base64url packageSheogorath2018-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was recently a possible security problem with base64url. Shouldn't really hit us but it doesn't hurt. Details: https://snyk.io/vuln/npm:base64url:20180511 Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Merge pull request #825 from SISheogorath/remove/GoogleDriveChristoph (Sheogorath) Kern2018-05-1611-516/+3
|\ \ \ \ | |/ / / |/| | | Removing google drive integration
| * | | Removing google drive integrationSheogorath2018-05-1611-516/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's sad but it's not working. For multiple releases this should be already broken which shows how often it's used. As there is also a security issue related to that, it's better to remove the feature completely. Whoever wants to rewrite it, feel free to go. This commit removes the Google Drive integration from HackMD's Frontend editor and this way removes the need to provide any API key and Client ID in the frontend. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #824 from hackmdio/revert-813-fix/googleAPIChristoph (Sheogorath) Kern2018-05-164-4/+10
|\ \ \ | | | | | | | | Revert "Workaround Google API problems"
| * | | Revert "Workaround Google API problems"Christoph (Sheogorath) Kern2018-05-164-4/+10
|/ / /
* | | Merge pull request #813 from SISheogorath/fix/googleAPIChristoph (Sheogorath) Kern2018-05-104-10/+4
|\ \ \ | | | | | | | | Workaround Google API problems
| * | | Remove Google Upload from UISheogorath2018-05-011-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This temporarily removes the Upload from the UI as it's broken right now. Needs a refactoring and can be added in again later on by undoing this commit. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * | | Use API key instead of clientSecretSheogorath2018-04-133-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As recently discovered we send the clientSecret to the webclient which is potentionally dangerous. This patch should fix the problem and replace the clientSecret with the originally intended and correct way to implement it using the API key. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Merge pull request #811 from hackmdio/fix-saml-typoChristoph (Sheogorath) Kern2018-04-281-2/+2
|\ \ \ \ | | | | | | | | | | Fix typo of "grouptAttribute" in saml auth module
| * | | | Fix typo of "grouptAttribute" in saml auth moduleMax Wu2018-04-271-2/+2
|/ / / / | | | | | | | | Signed-off-by: Max Wu <jackymaxj@gmail.com>
* | | | Merge pull request #803 from SISheogorath/fix/letterAvatarCSPChristoph (Sheogorath) Kern2018-04-173-11/+23
|\ \ \ \ | | | | | | | | | | Move letter-avatars into own request
| * | | | Move letter-avatars into own requestSheogorath2018-04-173-11/+23
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent further weakening of our CSP policies, moving the Avatars into a non-inline version is the way to go. This implementation probably needs some beautification. But already fixes the bug. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Update yarn.lockSheogorath2018-04-171-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Merge pull request #805 from SISheogorath/fix/noFileChristoph (Sheogorath) Kern2018-04-173-2/+7
|\ \ \ \ | | | | | | | | | | Fix possible file limit errors
| * | | | Fix possible file limit errorsSheogorath2018-04-163-2/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we currently may need higher nofile limits than usual/default on various systems this commit should probide a fix for that an allow to build HackMD without highering these limits and increase security. Inspiration was found in a copy-webpack-plugin-issue[1] and found by @thegcat[2]. Thanks for that! Signed-off-by: Sheogorath <sheogorath@shivering-isles.com> [1]: https://github.com/webpack-contrib/copy-webpack-plugin/issues/59#issuecomment-228563990 [2]: https://github.com/thegcat
* | | | Add config.json.example to npm testSheogorath2018-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit extends the find command to also match the example config file. This should validate the syntax or this file to prevent syntax errors for future pull request. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Fix example configSheogorath2018-04-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes some json fromat issues in our config example that causes errors on setup. This change should fix it. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Merge pull request #797 from SISheogorath/fix/LZErrorLogChristoph (Sheogorath) Kern2018-04-111-0/+9
|\ \ \ \ | | | | | | | | | | Add check for noteId length
| * | | | Add check for noteId lengthSheogorath2018-04-101-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we know the length of an UUID we can check if the base64 string of the provided UUID is long enough for a legacy base64 encoded nodeId and stop processing it in legacy mode, if it's not the case. This should make the ugly warning way less common. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | | Merge pull request #799 from SISheogorath/fix/AnonymousEditTyposChristoph (Sheogorath) Kern2018-04-113-4/+4
|\ \ \ \ \ | |_|/ / / |/| | | | Fix typos for `allowAnonymousEdits`
| * | | | Fix typos for `allowAnonymousEdits`Sheogorath2018-04-103-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like we lost some variables during the refactoring of the configs to camel case. This should fix it. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* / / / Extend READMESheogorath2018-04-111-0/+4
|/ / / | | | | | | | | | | | | | | | | | | Add hint about file descriptor limits and add the new translation platform. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Release 1.1.0-ceSheogorath2018-04-061-1/+1
| | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge branch 'feature/releaseNotes1.1.0'Sheogorath2018-04-062-12/+83
|\ \ \