From c20b55399e13c1e76aea3690c14fe75bf54ba8f2 Mon Sep 17 00:00:00 2001 From: "travishen.tw" Date: Tue, 26 Feb 2019 14:48:05 +0800 Subject: [PATCH 1/5] Update tag translations --- .../migrations/0004_auto_20190226_1439.py | 19 +++++++++++++++++++ backend/apps/cases/models.py | 2 +- backend/locale/zh_Hant/LC_MESSAGES/django.po | 4 ++-- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 backend/apps/cases/migrations/0004_auto_20190226_1439.py diff --git a/backend/apps/cases/migrations/0004_auto_20190226_1439.py b/backend/apps/cases/migrations/0004_auto_20190226_1439.py new file mode 100644 index 0000000..ee836aa --- /dev/null +++ b/backend/apps/cases/migrations/0004_auto_20190226_1439.py @@ -0,0 +1,19 @@ +# Generated by Django 2.1.7 on 2019-02-26 06:39 + +from django.db import migrations +import tagulous.models.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('cases', '0003_auto_20190226_1138'), + ] + + operations = [ + migrations.AlterField( + model_name='case', + name='tags', + field=tagulous.models.fields.TagField(_set_tag_meta=True, blank=True, help_text='Enter a comma-separated tag string', to='cases.Tagulous_Case_tags', verbose_name='Tags', verbose_name_plural='Tags'), + ), + ] diff --git a/backend/apps/cases/models.py b/backend/apps/cases/models.py index 03636b1..3c1111f 100644 --- a/backend/apps/cases/models.py +++ b/backend/apps/cases/models.py @@ -130,7 +130,7 @@ class Case(Model): disapprove_info = TextField(null=True, blank=True, verbose_name=_('Disapprove Info')) note = TextField(null=True, blank=True, verbose_name=_('Case Notes')) - tags = TagField(blank=True, verbose_name=_('Case Tags'), verbose_name_plural='Case Tags') + tags = TagField(blank=True, verbose_name=_('Tags'), verbose_name_plural=_('Tags')) objects = CaseQuerySet.as_manager() diff --git a/backend/locale/zh_Hant/LC_MESSAGES/django.po b/backend/locale/zh_Hant/LC_MESSAGES/django.po index e3cb70d..48ef625 100644 --- a/backend/locale/zh_Hant/LC_MESSAGES/django.po +++ b/backend/locale/zh_Hant/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-26 11:39+0800\n" +"POT-Creation-Date: 2019-02-26 14:41+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -149,7 +149,7 @@ msgid "Case Notes" msgstr "內部備註" #: apps/cases/models.py:133 -msgid "Case Tags" +msgid "Tags" msgstr "標籤" #: apps/cases/models.py:139 From 0fd13e4802fce3145a830eb76bccf529fae99919 Mon Sep 17 00:00:00 2001 From: "travishen.tw" Date: Tue, 26 Feb 2019 15:02:18 +0800 Subject: [PATCH 2/5] Update manifest.json --- backend/config/settings.py | 2 -- frontend/public/manifest.json | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/backend/config/settings.py b/backend/config/settings.py index fd3742f..dce3253 100644 --- a/backend/config/settings.py +++ b/backend/config/settings.py @@ -106,8 +106,6 @@ # See: https://docs.djangoproject.com/en/dev/ref/settings/#admins ADMINS = [ ('ssivart', 'travishen.tw@gmail.com'), - ('matt', 'fought123@gmail.com'), - ('kai', 'ankycheng@gmail.com'), ] # See: https://docs.djangoproject.com/en/dev/ref/settings/#managers diff --git a/frontend/public/manifest.json b/frontend/public/manifest.json index a8755db..6e27aa2 100644 --- a/frontend/public/manifest.json +++ b/frontend/public/manifest.json @@ -1,6 +1,6 @@ { - "name": "website", - "short_name": "website", + "name": "選服魔鏡號", + "short_name": "選服魔鏡號", "icons": [ { "src": "/img/icons/android-chrome-192x192.png", @@ -13,7 +13,7 @@ "type": "image/png" } ], - "start_url": "", + "start_url": "https://service.froggychiu.com", "display": "standalone", "background_color": "#000000", "theme_color": "#4DBA87" From acc48336b407ef32728dfd58b2bf59bab3e40eab Mon Sep 17 00:00:00 2001 From: Matt Lin Date: Tue, 26 Feb 2019 15:16:15 +0800 Subject: [PATCH 3/5] add notification for in-app uploading --- frontend/src/App.vue | 1 + frontend/src/components/InputCase.vue | 1 + frontend/src/store.js | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 57ab216..98656a6 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -33,6 +33,7 @@ export default { location.href = 'home?openExternalBrowser=1' this.inLineApp = true } + this.$store.commit('setIsInApp', true) } } else { this.$store.commit('setIsMobile', false) diff --git a/frontend/src/components/InputCase.vue b/frontend/src/components/InputCase.vue index 034a81e..973aba9 100644 --- a/frontend/src/components/InputCase.vue +++ b/frontend/src/components/InputCase.vue @@ -34,6 +34,7 @@ :accept="acceptFileType" :limit="5"> 上傳檔案 +
特定手機的應用程式內瀏覽器（InAppBrowser），可能無法上傳檔案，請使用手機原生瀏覽器。
1.上傳單檔限制為10MB，最多5個檔案。
2.可上傳的檔案類型為jpg, jpeg, png, mpg, mpeg, avi, wmv, mp3, mp4, zip, rar, 7z, txt, doc, docx, ppt, pptx, pdf, odt, xls, xlsx, key, pages, numbers。
2.可上傳的檔案類型為jpg, jpeg, png。
diff --git a/frontend/src/store.js b/frontend/src/store.js index 88c93e9..8b2611c 100644 --- a/frontend/src/store.js +++ b/frontend/src/store.js @@ -17,7 +17,8 @@ const store = new Vuex.Store({ redirectTo: null, firstVisit: false, isLoadingTable: false, - isMobile: null, + isMobile: false, + isInApp: false, authentication: false, browser: '' }, @@ -26,6 +27,9 @@ const store = new Vuex.Store({ setBrowser (state, browser) { state.browser = browser }, + setIsInApp (state, isinapp) { + state.isInApp = isinapp + }, setIsMobile (state, isMobile) { state.isMobile = isMobile }, From 3735d69fccb0aaf395b49ad4fdd389cb76499363 Mon Sep 17 00:00:00 2001 From: Matt Lin Date: Tue, 26 Feb 2019 16:20:55 +0800 Subject: [PATCH 4/5] mute the theme song --- frontend/src/components/ThemeSong.vue | 41 ++++++++++++++++++--------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/frontend/src/components/ThemeSong.vue b/frontend/src/components/ThemeSong.vue index 0fdd360..6529df8 100644 --- a/frontend/src/components/ThemeSong.vue +++ b/frontend/src/components/ThemeSong.vue @@ -1,5 +1,6 @@