Commit Graph

2618 Commits

Author SHA1 Message Date
Yukai Huang 1cf43e1fe2
Merge pull request #1381 from YusukeIwaki/feature/bitbucket_login
Add bitbucket Support
2019-12-30 09:54:11 +08:00
YusukeIwaki 12d4aa8a4f Add environment variables definition for Scalingo deploy.
Signed-off-by: YusukeIwaki <iwaki+git@i3-systems.com>
2019-12-28 23:24:16 +09:00
YusukeIwaki 6be31aba9b Remove unused imports, fixing coding style issues.
Signed-off-by: YusukeIwaki <iwaki+git@i3-systems.com>
2019-12-28 23:00:58 +09:00
YusukeIwaki 83fe0815d5 Add environment variables definition for Heroku deploy.
Signed-off-by: YusukeIwaki <iwaki+git@i3-systems.com>
2019-12-28 22:23:20 +09:00
YusukeIwaki d5dd27f745 Implement bitbucket login.
Signed-off-by: YusukeIwaki <iwaki+git@i3-systems.com>
2019-12-28 22:22:15 +09:00
Yukai Huang 3f089c7926
Merge branch 'master' into develop 2019-12-14 11:06:00 +08:00
Max Wu a5bb0d692d
Merge pull request #1379 from hackmdio/release/1.4.1
Release/1.4.1
2019-12-14 10:59:43 +08:00
Yukai Huang 520853387a
Update 1.4.1 release note
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2019-12-14 00:12:37 +08:00
Yukai Huang 7d3931db3d
Bump version to 1.4.1
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2019-12-14 00:12:11 +08:00
Max Wu b634ee2253
Merge pull request #1378 from hackmdio/bugfix/urlpath
Fix urlpath in webpack build
2019-12-13 17:24:48 +08:00
Yukai Huang a1c5c68611
Fix urlpath in webpack build
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2019-12-13 17:06:30 +08:00
Max Wu d5ed691ebe
feat(imageUpload): upgrade minio version to 7.0.12 (#1377)
feat(imageUpload): upgrade minio version to 7.0.12
2019-12-13 12:28:09 +08:00
BoHong Li 8629670b0e
feat(imageUpload): upgrade minio version to 7.0.12
Signed-off-by: BoHong Li <raccoon@hackmd.io>
2019-12-13 12:18:42 +08:00
Max Wu 054dd4048b
Merge pull request #1376 from hackmdio/fix/minio-can-not-upload
fix: minio cannot upload caused by package upgrade
2019-12-12 23:46:12 +08:00
BoHong Li d212d3fea0
fix: minio cannot upload caused by package upgrade
Signed-off-by: BoHong Li <raccoon@hackmd.io>
2019-12-12 22:39:50 +08:00
Yukai Huang b771baf7ab
Explicitely set uploaded image ACLs for S3 to "public-read" (#1371)
Explicitely set uploaded image ACLs for S3 to "public-read"
2019-12-06 17:49:09 +08:00
Martin Honermeyer 3fe6ec71e3 Explicitely set uploaded image ACLs for S3 to "public-read"
This works around permission problems with DigitalOcean spaces (where
files are always *private* by default).

This should not pose a difference with AWS and other providers as CodiMD
only works with public S3 assets either way.

Signed-off-by: Martin Honermeyer <maze@strahlungsfrei.de>
2019-12-05 18:37:42 +01:00
Max Wu 510ccf7539
Merge pull request #1370 from soerface/patch-1
Fix #1369 - make manage_users work again
2019-12-06 00:02:14 +08:00
Sören Wegener 45d4daf0f3
Check for falsy existingUser variable. Fixes #1369
Use another return code for "User already exist"
This allows external scripts differentiating between "failure" and "everything is fine"

Co-Authored-By: Max Wu <jackymaxj@gmail.com>
Signed-off-by: Soeren Wegener <wegener92@gmail.com>
2019-12-05 15:35:33 +01:00
Yukai Huang f0c26b3a8c
Merge pull request #1360 from brandon-welsch/feature/scalingo_deployment
Added Scalingo compatible deployment
2019-12-02 19:06:40 +08:00
Max Wu 725795651a
Merge pull request #1365 from quite/fixlocation
fix: correct to singular location
2019-12-02 19:03:12 +08:00
Daniel Lublin db0ee65fc8 fix: correct to singular location
Signed-off-by: Daniel Lublin <daniel@lublin.se>
2019-12-01 16:49:28 +01:00
Max Wu 547262243c
fix: mysql2 not install (#1362)
fix: mysql2 not install
2019-12-01 00:28:24 +08:00
BoHong Li f7ef491bf3
fix: mysql2 not install
Signed-off-by: BoHong Li <raccoon@hackmd.io>
2019-11-30 14:42:59 +08:00
Brandon WELSCH abde89064f
Added Scalingo compatible deployment
Signed-off-by: Brandon WELSCH <dev@brandon-welsch.eu>
2019-11-29 11:52:01 +01:00
Max Wu 76f4c001d1
Merge pull request #1357 from hackmdio/fix/pcheck-related-issues
fix pcheck not parsed url correctly
2019-11-29 15:09:45 +08:00
BoHong Li f1594c56e2
feat: upgrade base image to resolve pcheck issues
1. upgrade node.js version from 8.16.0 to 8.16.2
2. upgrade pcheck to support connection string from environment
3. upgrade pcheck to fix connection string contains underscore might not resolve correctly

Signed-off-by: BoHong Li <raccoon@hackmd.io>
2019-11-28 15:57:31 +08:00
Yukai Huang 5002ec4b4e
Merge branch 'master' into develop 2019-11-15 17:43:22 +08:00
Yukai Huang daafd21405
Add line break to README migration section (#1349)
Add line break to README migration section
2019-11-15 17:36:10 +08:00
Yukai Huang 56a35f5935
Add line break to README migration section
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2019-11-14 17:32:37 +08:00
Max Wu a0cc1955cb
Prepare release 1.4.0 (#1344)
Prepare release 1.4.0
2019-11-11 17:28:00 +08:00
Yukai Huang 2358dd2fa3
Bump version to 1.4.0
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2019-11-11 16:58:51 +08:00
Yukai Huang 137e5dfb48
Update release note for 1.4.0
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2019-11-11 16:58:51 +08:00
Yukai Huang 83274b862f
Bump sequelize from 5.3.5 to 5.15.1 (#1343)
Bump sequelize from 5.3.5 to 5.15.1

Co-authored-by: null <49699333+dependabot[bot]@users.noreply.github.com>
2019-11-10 22:30:17 +08:00
dependabot[bot] e6a3a79c13
Bump sequelize from 5.3.5 to 5.15.1
Bumps [sequelize](https://github.com/sequelize/sequelize) from 5.3.5 to 5.15.1.
- [Release notes](https://github.com/sequelize/sequelize/releases)
- [Commits](https://github.com/sequelize/sequelize/compare/v5.3.5...v5.15.1)

Signed-off-by: dependabot[bot] <support@github.com>
2019-11-10 14:04:43 +00:00
Yukai Huang 606424c2bc
Bugfix/slide mode printpdf (#1339)
Bugfix/slide mode printpdf
2019-11-07 13:42:35 +08:00
Yukai Huang 7c3293768b
Remove transform-style workaround in eab984d
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2019-11-06 13:28:33 +08:00
Max Wu f4921a129a
Update markdownlint & webpack bundling (#1332)
Update markdownlint & webpack bundling
2019-11-01 17:19:50 +08:00
Yukai Huang f1586c57dd
Fix linter error
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2019-11-01 16:47:41 +08:00
Yukai Huang bfc50b8bb9
Update markdownlint & webpack bundling
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
2019-11-01 16:34:13 +08:00
Yukai Huang aa5a50facf
Merge pull request #1306 from hackmdio/feature/configurable-break-style
Configurable default break style
2019-11-01 12:16:06 +08:00
Yukai Huang 75ee5ad255
Merge branch 'develop' into feature/configurable-break-style 2019-11-01 10:27:47 +08:00
Yukai Huang f871eff28d
Merge pull request #1327 from kamijin-fanta/github-enterprise
support to login with github enterprise
2019-11-01 10:22:46 +08:00
Yukai Huang 7fd36b1b33
Add https_proxy support to gitlab oauth (#1296)
Add https_proxy support to gitlab oauth
2019-11-01 10:22:08 +08:00
kamijin_fanta 9e6f980d8d github-login: move comment to default.js
Signed-off-by: kamijin_fanta <kamijin@live.jp>
2019-10-30 17:02:15 +09:00
Ruben ten Hove 2a365d6971 fix linter issues
Signed-off-by: Ruben ten Hove <git@rhtenhove.nl>
2019-10-30 07:58:36 +01:00
Ruben ten Hove afc4a3e11d yarn add https-proxy-agent
Signed-off-by: Ruben ten Hove <git@rhtenhove.nl>
2019-10-30 07:49:43 +01:00
rhtenhove bac3921197 Add https_proxy support to gitlab oauth
Signed-off-by: Ruben ten Hove <git@rhtenhove.nl>
2019-10-30 07:49:43 +01:00
Yukai Huang 65ecb6d2ec
Allow to generate lower case header references through the conf… (#1310)
Allow to generate lower case header references through the config
2019-10-30 14:44:40 +08:00
hoijui 558fa5fcf4 make standard conform [fix]
Signed-off-by: hoijui <hoijui.quaero@gmail.com>
2019-10-29 13:20:18 +01:00