summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add support for generic OAuth2 providersPedro Ferreira2018-03-268-4/+138
| | | | Signed-off-by: Pedro Ferreira <pedro.ferreira@cern.ch>
* Merge pull request #779 from SISheogorath/fix/cspForVideoChristoph (Sheogorath) Kern2018-03-261-0/+1
|\ | | | | Allow embedding of video and audio tags
| * Allow embedding of video and audio tagsSheogorath2018-03-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Adding mediaSrc to CSP so video and audio files can be embedded without problems. From a security perspective it should be fine to load audio and video data without introducing a high security issue. Only from a privacy perspective it allows another way to track users if there are data embedded. But it doesn't introduce any new attack vector as pictures are also allowed from everywhere. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #778 from SISheogorath/fix/nightModeToggleChristoph (Sheogorath) Kern2018-03-261-0/+1
|\ \ | |/ |/| Fix night mode button after restore
| * Fix night mode button after restoreSheogorath2018-03-251-0/+1
|/ | | | | | | | | | | The night mode toggle doesn't get the right state after restore from local storage. This results in the need to toggle twice to disable night mode. This patch adds the needed class so the toggleNightMode function gets the right state on execution. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #758 from SISheogorath/cleanup/configChristoph (Sheogorath) Kern2018-03-2529-238/+291
|\ | | | | Change config to camel case with backwards compatibility
| * Change config to camel case with backwards compatibilitySheogorath2018-03-2529-238/+291
| | | | | | | | | | | | | | | | This refactors the configs a bit to now use camel case everywhere. This change should help to clean up the config interface and make it better understandable. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #775 from SISheogorath/feature/nightModeChristoph (Sheogorath) Kern2018-03-241-3/+18
|\ \ | |/ |/| Persist nightmode so we can re-enable it on reload
| * Persist nightmode so we can re-enable itSheogorath2018-03-231-3/+18
|/ | | | | | | | | Right now the night mode is possible to set by a toggle in the menu bar but needs to be re-enabled on every document switch, reload, etc.. This is super annoying so we should keep this state in local storage or a cookie. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* Merge pull request #772 from SISheogorath/fix/chromeFileErrorChristoph (Sheogorath) Kern2018-03-211-4/+7
|\ | | | | Some fixes for inline-Attachments in Codemirror
| * Reorganize usage of `getAsFile()`Sheogorath2018-03-181-2/+5
| | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
| * Fix typo in vedor extensionSheogorath2018-03-181-2/+2
| | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #771 from SISheogorath/refactor/imageRouterChristoph (Sheogorath) Kern2018-03-217-132/+190
|\ \ | | | | | | Refactoring imageRouter to modularity
| * | Refactoring imageRouter to modularitySheogorath2018-03-207-132/+190
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Update yarn.lockSheogorath2018-03-181-0/+4
| | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #770 from SISheogorath/fix/ldapUUIDChristoph (Sheogorath) Kern2018-03-181-1/+8
|\ \ | | | | | | Add check for undefined UUID
| * | Add check for undefined UUIDSheogorath2018-03-181-1/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | This check is needed at there are tons of LDAP implementations out there and none has at least one guaranteed unique field. As we currently check three fields and added an option to select one yourself, it's still not said that any of these fields is set. This will now create an error and fail the authentication instead of letting people may get access to other people's notes which are stored under a this way deterministic wrong userid named `LDAP-undefined`. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | Merge pull request #743 from hackmdio/fix-to-use-url-safe-base64Christoph (Sheogorath) Kern2018-03-187-10/+101
|\ \ | | | | | | Fix to use url-safe base64 in note url
| * | Fix typoMax Wu2018-03-111-1/+1
| | | | | | | | | | | | Signed-off-by: Max Wu <jackymaxj@gmail.com>
| * | Update to show log on migrate LZString type note url in historyMax Wu2018-03-111-1/+1
| | | | | | | | | | | | Signed-off-by: Max Wu <jackymaxj@gmail.com>
| * | Fix to log instead of throwing error on parse note idMax Wu2018-03-111-2/+4
| | | | | | | | | | | | Signed-off-by: Max Wu <jackymaxj@gmail.com>
| * | Fix parseNoteId order to fix some edge caseMax Wu2018-03-101-7/+7
| | | | | | | | | | | | | | | | | | that LZString note url could be parsed by base64url note url and thus return wrong note id Signed-off-by: Max Wu <jackymaxj@gmail.com>
| * | Improve history migration performanceMax Wu2018-03-101-11/+5
| | | | | | | | | | | | Signed-off-by: Max Wu <jackymaxj@gmail.com>
| * | Update to migrate note url in the history of browser storage and cookieMax Wu2018-03-032-0/+47
| | | | | | | | | | | | Signed-off-by: Max Wu <jackymaxj@gmail.com>
| * | Update to use buffer in encode/decode note idMax Wu2018-02-271-2/+4
| | | | | | | | | | | | Signed-off-by: Max Wu <jackymaxj@gmail.com>
| * | Add migration for LZString compressed note id in historyMax Wu2018-02-261-1/+21
| | | | | | | | | | | | Signed-off-by: Max Wu <jackymaxj@gmail.com>
| * | Remove and replace all note id compression in LZString with base64urlMax Wu2018-02-264-8/+34
| | | | | | | | | | | | Signed-off-by: Max Wu <jackymaxj@gmail.com>
* | | Merge pull request #757 from SISheogorath/fix/migrationChristoph (Sheogorath) Kern2018-03-171-0/+11
|\ \ \ | | | | | | | | Add missing migration for permissions
| * | | Add missing migration for permissionsSheogorath2018-03-061-0/+11
| | | | | | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | | Merge pull request #769 from SISheogorath/fix/minioIntegerChristoph (Sheogorath) Kern2018-03-172-3/+10
|\ \ \ \ | |_|_|/ |/| | | Add helper function to fix number problems
| * | | Add helper function to fix number problemsSheogorath2018-03-162-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/reportURIChristoph (Sheogorath) Kern2018-03-144-2/+12
|\ \ \ | | | | | | | | Add config option for report URI in CSP
| * | | Add config option for report URI in CSPSheogorath2018-03-144-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #765 from vazontang/masterChristoph (Sheogorath) Kern2018-03-141-1/+1
|\ \ \ \ | | | | | | | | | | Convert HMD_MINIO_PORT into Number type.
| * | | | Convert HMD_MINIO_PORT into Number type.vazontang2018-03-151-1/+1
|/ / / / | | | | | | | | | | | | | | | | fix hackmdio/hackmd#763 Signed-off-by: Tang TsungYi <vazontang@gmail.com>
* | | | Merge pull request #760 from thegcat/fix/support_multiple_emails_in_ldapChristoph (Sheogorath) Kern2018-03-101-1/+1
|\ \ \ \ | |/ / / |/| | | Multiple emails from LDAP are already an Array
| * | | Multiple emails from LDAP are already an ArrayFelix Schäfer2018-03-091-1/+1
|/ / / | | | | | | | | | Signed-off-by: Felix Schäfer <felix@thegcat.net>
* | | Update yarn.lockSheogorath2018-03-071-77/+0
| | | | | | | | | | | | Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
* | | Merge pull request #756 from davidmehren/masterChristoph (Sheogorath) Kern2018-03-072-7/+4
|\ \ \ | |/ / |/| | Remove engine.io-client dependency
| * | Remove engine.io-client dependency and fix webpack configDavid Mehren2018-03-062-7/+4
|/ / | | | | | | Signed-off-by: David Mehren <dmehren1@gmail.com>
* | Merge pull request #755 from thegcat/fix/remove_unused_ldap_optionsChristoph (Sheogorath) Kern2018-03-064-4/+0
|\ \ | | | | | | | | | | | | Remove unused LDAP option `tokenSecret` fixes #754
| * | Remove unused LDAP option `tokenSecret`Felix Schäfer2018-03-054-4/+0
|/ / | | | | | | | | | | hackmdio/hackmd#754 Signed-off-by: Felix Schäfer <felix@thegcat.net>
* | Merge pull request #753 from senk/patch-1Christoph (Sheogorath) Kern2018-03-051-1/+1
|\ \ | | | | | | Fix small typo
| * | Fix small typoRobin Naundorf2018-03-051-1/+1
|/ / | | | | | | Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
* | Merge pull request #750 from fooker/masterChristoph (Sheogorath) Kern2018-03-035-3/+10
|\ \ | | | | | | Use ldap.usernameField over hardcoded uid fields
| * | Introduce ldap.useridFieldDustin Frisch2018-03-015-3/+10
|/ / | | | | | | Signed-off-by: Dustin Frisch <fooker@lab.sh>
* | Merge pull request #744 from hackmdio/add-more-html5-tagsChristoph (Sheogorath) Kern2018-02-262-5/+17
|\ \ | |/ |/| Support more html5 tags and styles
| * Update styles of details, summary and figureMax Wu2018-02-261-2/+14
| | | | | | | | Signed-off-by: Max Wu <jackymaxj@gmail.com>
| * Update to allow rp tag for rubyMax Wu2018-02-261-0/+2
| | | | | | | | Signed-off-by: Max Wu <jackymaxj@gmail.com>
| * Remove manual allow details tag since default already allow itMax Wu2018-02-261-3/+1
|/ | | | Signed-off-by: Max Wu <jackymaxj@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 18:59:03 +0000