Commit Graph

2884 Commits

Author SHA1 Message Date
Jakub Sokołowski 0d1cd1d2f0
feat: add organizations whitelist to GitHub OAuth
Currently CodiMD does not support limiting access of GitHub OAuth users
based on their organization membership. This is a very useful
functionality for teams that want to limit write access to their notes.

I've implemented a crude solution to this problem, which most probably
requires some adjusments to make it better. I'm not sure if this
implementation is kosher, but it definitely works on my deployment.

Open to suggestions on how I can improve it.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2021-08-23 16:24:02 +02:00
Raccoon 3b1e270952
Merge pull request #1701 from YadominJinta/develop
Add arm64 docker image build.
2021-07-09 18:37:02 +08:00
Raccoon e7a5ea813a
Merge pull request #1587 from tamo/more-i18n
Move HTML-related code from JS to EJS to enable more i18n
2021-07-09 15:08:03 +08:00
Raccoon 620197faf7
Merge pull request #1580 from tamo/master
Convert "include" directives to functions
2021-07-09 15:06:06 +08:00
Max Wu 4b78202494
Merge pull request #1605 from tamo/patch-1 2021-07-09 15:04:18 +08:00
Max Wu 6b8950d235
Merge pull request #1481 from ghost/lang-attr 2021-07-09 14:59:49 +08:00
YadominJinta 9c280b064e Add support for arm64 build
Signed-off-by: YadominJinta <i@yadom.in>
2021-07-05 19:03:03 +08:00
Max Wu 1bdedf17b6
Merge pull request #1688 from hackmdio/chore/dev-container
Add dev container for GitHub Codespaces and VSCode remote container
2021-06-16 21:27:29 +08:00
Raccoon e623b72054
Merge pull request #1690 from hackmdio/feature/upgrade-mermaid-8.10.1
Upgrade mermaid to version 8.10.2 to avoid prototype pollution
2021-06-16 19:17:16 +08:00
Raccoon 82b78007dd
Merge pull request #1691 from hackmdio/bugfix/fix-gist-id-stored-XSS
Strip HTML tags for gist id to avoid stored XSS on showing error [Security Issue]
2021-06-16 19:11:34 +08:00
Max Wu 16a1e82835 feat: upgrade mermaid to version 8.10.2
Signed-off-by: Max Wu <jackymaxj@gmail.com>
2021-06-16 19:10:30 +08:00
Max Wu e75e28c80d feat: upgrade mermaid to version 8.10.1
to avoid mermaid prototype pollution https://github.com/mermaid-js/mermaid/issues/1940

Signed-off-by: Max Wu <jackymaxj@gmail.com>
2021-06-16 19:10:30 +08:00
Max Wu 2eefe7706f fix: strip html tags for gist file, gist line, gist highlight line, gist show loading attrtributes
Signed-off-by: Max Wu <jackymaxj@gmail.com>
2021-06-16 19:00:04 +08:00
Max Wu 6966881152 fix: strip html tags for gist id to avoid stored XSS on showing error [Security Issue]
Signed-off-by: Max Wu <jackymaxj@gmail.com>
2021-06-16 19:00:04 +08:00
Raccoon 282fcab4f7
Merge pull request #1694 from hackmdio/chore/github-actions
Run CI with GitHub Actions
2021-06-16 18:24:40 +08:00
Yukai Huang dcfdb0129c
Remove travis CI config
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2021-06-10 12:52:13 +08:00
Yukai Huang 24323975c7
Fix doctoc workflow
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2021-06-10 12:51:47 +08:00
Yukai Huang 71dce28c04
Add doctoc check
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2021-06-10 12:44:46 +08:00
Yukai Huang 34f502c166
Add test and build actions
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2021-06-10 12:31:58 +08:00
Raccoon 2338113655
chore: add dev container
Signed-off-by: Raccoon <raccoon@hackmd.io>
2021-05-28 16:22:48 +08:00
Raccoon 8c20d9f625
Merge pull request #1685 from hackmdio/feature/upgrade-flowchart.js-1.15.0
Upgrade flowchart.js to version 1.15.0
2021-05-25 14:39:49 +08:00
Raccoon b27f1474bc
Merge pull request #1684 from hackmdio/feature/support-mhchem-mathjax
Add TeX mhchem extensions for MathJax
2021-05-25 14:39:32 +08:00
Raccoon 599fd41c83
Merge pull request #1683 from hackmdio/bugfix/fix-image-upload-s3-config
Fix S3 client config passing for image upload
2021-05-19 15:42:31 +08:00
Max Wu b6837f1a82 feat: upgrade flowchart.js to version 1.15.0
Signed-off-by: Max Wu <jackymaxj@gmail.com>
2021-05-18 10:56:06 +08:00
Max Wu a913c61828 feat: bump package-lock codimd version
Signed-off-by: Max Wu <jackymaxj@gmail.com>
2021-05-18 10:56:06 +08:00
Max Wu e9293b0c30 feat: add TeX mhchem extensions for MathJax
Signed-off-by: Max Wu <jackymaxj@gmail.com>
2021-05-13 23:45:12 +08:00
Max Wu a41c4db0c2 fix: S3 client config passing for image upload
ref issue: https://github.com/aws/aws-sdk-js-v3/issues/1396

Signed-off-by: Max Wu <jackymaxj@gmail.com>
2021-05-13 19:03:25 +08:00
Raccoon 54f6e55b71
Merge pull request #1679 from hackmdio/bugfix/fix-no-referrer-for-return-url
Handle when request url has no valid referer
2021-05-13 12:56:42 +08:00
Raccoon 3af5408d58
Merge pull request #1680 from hackmdio/bugfix/fix-export-user-data-filename-zero
Avoid append zero suffix on exporting user data
2021-05-13 12:56:04 +08:00
Max Wu db5fc5075a fix: avoid append zero suffix on exporting user data
Signed-off-by: Max Wu <jackymaxj@gmail.com>
2021-05-13 11:57:13 +08:00
Max Wu 5e709653ab fix: handle when request url has no valid referer
Signed-off-by: Max Wu <jackymaxj@gmail.com>
2021-05-13 11:53:03 +08:00
Tamotsu Takahashi 9343d3222b Merge branch 'patch-1' of https://github.com/tamo/codimd into patch-1 2021-05-13 11:44:12 +09:00
TAKAHASHI Tamotsu ad1bfa6bc6 Update public/js/index.js
simplify the regex
suggested by yukaii in #1605

Co-authored-by: Yukai Huang <yukaihuangtw@gmail.com>
Signed-off-by: Tamotsu Takahashi <ttakah@gmail.com>
2021-05-13 11:41:45 +09:00
TAKAHASHI Tamotsu 400230618d
Update public/js/index.js
simplify the regex
suggested by yukaii in #1605

Co-authored-by: Yukai Huang <yukaihuangtw@gmail.com>
2021-05-12 09:22:03 +09:00
Yukai Huang 37b656df93
Merge pull request #1678 from hackmdio:release/2.4.1
Release 2.4.1
2021-05-11 20:03:28 +08:00
Yukai Huang 57f5134d9f
Bump package.json version
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2021-05-11 19:53:36 +08:00
Yukai Huang 8a38a60714 Merge branch 'master' into develop 2021-05-11 19:26:49 +08:00
Yukai Huang 2e468db210
Merge pull request #1677 from hackmdio/release/2.4.0
Release 2.4.0
2021-05-11 19:24:04 +08:00
Yukai Huang 792f70504a
Update release for 2.4.0
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2021-05-11 18:52:55 +08:00
Max Wu 6585976e4d
Merge pull request #1588 from tamo/google-oauth-verified 2021-05-11 17:41:33 +08:00
Yukai Huang ee1230b6f4
Merge pull request #1532 from freitagsrunde/feature/customTocLevel
Set TOC depth freely for every note by using YAML metadata or an option within `[toc]`
2021-05-11 17:30:31 +08:00
Yukai Huang cab80c105d
Merge pull request #1676 from hackmdio/bugfix/parseNoteIdByAlias-id-resolve
Fix parseNoteId bug
2021-05-11 17:18:23 +08:00
Yukai Huang 98bf5a6148
Fix async series been interrupted by parse alias
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2021-05-11 16:51:27 +08:00
Yukai Huang 0c3171b17d
Merge pull request #1570 from hackmdio/bugfix/update-history-usage
Use encoded noteId when calling updateHistory
2021-05-11 16:27:50 +08:00
Yukai Huang ab58cd45b4 Use encoded noteId in updateHistory call
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2021-05-11 16:21:46 +08:00
Yukai Huang bec877c11c
Merge pull request #1577 from hackmdio/feature/more-editor-modes
Allow more syntax highlight modes in editor
2021-05-11 16:19:22 +08:00
Yukai Huang cfe653152a Allow more syntax highlight modes in cm
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2021-05-11 16:10:48 +08:00
Yukai Huang 025f6d2149
Merge pull request #1625 from pichouk/develop
Add some help strings to Prometheus metrics
2021-05-11 15:56:48 +08:00
Yukai Huang 94473c2b5f
Merge pull request #1629 from a-andreyev/aa13q-add-matrix-bage
Add matrix badge and links to README
2021-05-11 15:38:29 +08:00
Yukai Huang c01a4b46ec
Merge pull request #1624 from fujexo/feature_mediawiki
display mediawiki export format
2021-05-11 15:37:37 +08:00