Merge branch 'master' into develop

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"},

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: ""

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',

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',

frontend/i18n/zh/rules.js

@@ -33,7 +33,7 @@ export default {
   },
   uploadFileRules: {
     fileRequired: '请输入文件',
-    fileLessThan1MB: '文件大小必须小于 1 MB!'
+    fileLessThan1MB: '文件大小必须小于 100 MB!'
   },
   passwordRules: {
     passwordRequired: '请输入密码',

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)