From 6dd094a97005719b00e1444d0e16e10b121337eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 20:54:55 +0000 Subject: [PATCH 1/4] Bump waitress from 2.1.1 to 2.1.2 in /backend Bumps [waitress](https://github.com/Pylons/waitress) from 2.1.1 to 2.1.2. - [Release notes](https://github.com/Pylons/waitress/releases) - [Changelog](https://github.com/Pylons/waitress/blob/v2.1.2/CHANGES.txt) - [Commits](https://github.com/Pylons/waitress/compare/v2.1.1...v2.1.2) --- updated-dependencies: - dependency-name: waitress dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- backend/poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/poetry.lock b/backend/poetry.lock index adf8d8fa..f6f998c0 100644 --- a/backend/poetry.lock +++ b/backend/poetry.lock @@ -1460,7 +1460,7 @@ python-versions = ">=3.6" [[package]] name = "waitress" -version = "2.1.1" +version = "2.1.2" description = "Waitress WSGI server" category = "main" optional = false @@ -2545,8 +2545,8 @@ vine = [ {file = "vine-5.0.0.tar.gz", hash = "sha256:7d3b1624a953da82ef63462013bbd271d3eb75751489f9807598e8f340bd637e"}, ] waitress = [ - {file = "waitress-2.1.1-py3-none-any.whl", hash = "sha256:c549f5b2b4afd44d9d97d7cec79f3ef581e25d832827f415dc175327af674aa8"}, - {file = "waitress-2.1.1.tar.gz", hash = "sha256:e2e60576cf14a1539da79f7b7ee1e79a71e64f366a0b47db54a15e971f57bb16"}, + {file = "waitress-2.1.2-py3-none-any.whl", hash = "sha256:7500c9625927c8ec60f54377d590f67b30c8e70ef4b8894214ac6e4cad233d2a"}, + {file = "waitress-2.1.2.tar.gz", hash = "sha256:780a4082c5fbc0fde6a2fcfe5e26e6efc1e8f425730863c04085769781f51eba"}, ] watchdog = [ {file = "watchdog-2.1.6-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:9693f35162dc6208d10b10ddf0458cc09ad70c30ba689d9206e02cd836ce28a3"}, From 72b4daeb4e8f8aba28adeaceed7711bc6c6df508 Mon Sep 17 00:00:00 2001 From: Yasuhiro Morioka Date: Fri, 17 Jun 2022 00:05:45 +0900 Subject: [PATCH 2/4] fix #1816 --- frontend/pages/projects/_id/sequence-labeling/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/pages/projects/_id/sequence-labeling/index.vue b/frontend/pages/projects/_id/sequence-labeling/index.vue index 37ecd135..3b132001 100644 --- a/frontend/pages/projects/_id/sequence-labeling/index.vue +++ b/frontend/pages/projects/_id/sequence-labeling/index.vue @@ -127,7 +127,7 @@ export default { this.$route.query.isChecked ) const doc = this.docs.items[0] - if (this.enableAutoLabeling) { + if (this.enableAutoLabeling && !doc.isConfirmed) { await this.autoLabel(doc.id) } await this.list(doc.id) From e12ff68acce8144774969c4f8c82f1357f424641 Mon Sep 17 00:00:00 2001 From: Yasuhiro Morioka Date: Wed, 22 Jun 2022 20:07:33 +0900 Subject: [PATCH 3/4] fix de, fr and zh messages --- frontend/i18n/de/rules.js | 2 +- frontend/i18n/fr/rules.js | 2 +- frontend/i18n/zh/rules.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/i18n/de/rules.js b/frontend/i18n/de/rules.js index f9340570..be58129c 100644 --- a/frontend/i18n/de/rules.js +++ b/frontend/i18n/de/rules.js @@ -29,7 +29,7 @@ export default { }, uploadFileRules: { fileRequired: 'Datei(en) werden benötigt', - fileLessThan1MB: 'Dateigröße muss kleiner als 1 MB sein!' + fileLessThan1MB: 'Dateigröße muss kleiner als 100 MB sein!' }, passwordRules: { passwordRequired: 'Passwort wird benötigt', diff --git a/frontend/i18n/fr/rules.js b/frontend/i18n/fr/rules.js index 23a23004..dea05ef6 100644 --- a/frontend/i18n/fr/rules.js +++ b/frontend/i18n/fr/rules.js @@ -29,7 +29,7 @@ export default { }, uploadFileRules: { fileRequired: 'Le fichier est obligatoire', - fileLessThan1MB: 'La taille du fichier doit être inférieure à 1MB' + fileLessThan1MB: 'La taille du fichier doit être inférieure à 100 MB' }, passwordRules: { passwordRequired: 'Le mot de passe est obligatoire', diff --git a/frontend/i18n/zh/rules.js b/frontend/i18n/zh/rules.js index 84048d12..d1b56bbb 100644 --- a/frontend/i18n/zh/rules.js +++ b/frontend/i18n/zh/rules.js @@ -33,7 +33,7 @@ export default { }, uploadFileRules: { fileRequired: '请输入文件', - fileLessThan1MB: '文件大小必须小于 1 MB!' + fileLessThan1MB: '文件大小必须小于 100 MB!' }, passwordRules: { passwordRequired: '请输入密码', From 7836c5739044ba6f99f848b5b8774725462b44ef Mon Sep 17 00:00:00 2001 From: Alan Date: Fri, 8 Jul 2022 14:31:43 +0800 Subject: [PATCH 4/4] update docker-compose: set nginx image name to doccano_nginx:prod update docker-compose: set nginx image name to doccano_nginx:prod Signed-off-by: Alan Zhu --- docker/docker-compose.prod.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml index fa642f2d..11bc0540 100644 --- a/docker/docker-compose.prod.yml +++ b/docker/docker-compose.prod.yml @@ -59,6 +59,7 @@ services: build: context: .. dockerfile: docker/Dockerfile.nginx + image: doccano_nginx:prod environment: API_URL: "http://backend:8000" GOOGLE_TRACKING_ID: ""