From cda222a648b118e62ae318df1c17fc7fd54d2a1b Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 19 Jan 2023 13:39:08 +0100 Subject: [PATCH 1/9] change contribution memo add word-break --- .../src/components/Contributions/ContributionListItem.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index 4717f29e5..faec028f9 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -16,12 +16,15 @@ -
{{ firstName }} {{ lastName }}
+
+ {{ firstName }} {{ lastName }} + +
{{ $d(new Date(contributionDate), 'monthAndYear') }}
{{ $t('contributionText') }}
-
{{ memo }}
+
{{ memo }}
{{ $t('contribution.alert.answerQuestion') }}
From e519f048fe59c2eded6c25aed14f31c0f9ef0ef8 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 19 Jan 2023 14:27:38 +0100 Subject: [PATCH 2/9] add no-resize props on InpuArea.vue --- frontend/src/components/Inputs/InputTextarea.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/components/Inputs/InputTextarea.vue b/frontend/src/components/Inputs/InputTextarea.vue index e8dcf2840..4096a1b09 100644 --- a/frontend/src/components/Inputs/InputTextarea.vue +++ b/frontend/src/components/Inputs/InputTextarea.vue @@ -18,6 +18,7 @@ rows="4" max-rows="4" :disabled="disabled" + no-resize="true" > {{ errors[0] }} From 3f6bcdc0d2d4025458c62766cb8378a10cc7aacd Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 19 Jan 2023 14:42:36 +0100 Subject: [PATCH 3/9] add text-break on all table memo fields --- admin/src/components/CreationTransactionList.vue | 2 +- admin/src/components/Tables/OpenCreationsTable.spec.js | 2 +- admin/src/components/TransactionLinkList.vue | 2 +- admin/src/pages/CreationConfirm.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue index 2ce143c7f..950afcebc 100644 --- a/admin/src/components/CreationTransactionList.vue +++ b/admin/src/components/CreationTransactionList.vue @@ -88,7 +88,7 @@ export default { return `${value} GDD` }, }, - { key: 'memo', label: this.$t('transactionlist.memo') }, + { key: 'memo', label: this.$t('transactionlist.memo'), class: 'text-break' }, ], } }, diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js index 2eb149e4f..9e43fd66c 100644 --- a/admin/src/components/Tables/OpenCreationsTable.spec.js +++ b/admin/src/components/Tables/OpenCreationsTable.spec.js @@ -57,7 +57,7 @@ const propsData = { return value + ' GDD' }, }, - { key: 'memo', label: 'text' }, + { key: 'memo', label: 'text', class: 'text-break' }, { key: 'date', label: 'date', diff --git a/admin/src/components/TransactionLinkList.vue b/admin/src/components/TransactionLinkList.vue index d850083cc..564865440 100644 --- a/admin/src/components/TransactionLinkList.vue +++ b/admin/src/components/TransactionLinkList.vue @@ -67,7 +67,7 @@ export default { return `${value} GDD` }, }, - { key: 'memo', label: this.$t('transactionlist.memo') }, + { key: 'memo', label: this.$t('transactionlist.memo'), class: 'text-break' }, { key: 'validUntil', label: this.$t('transactionlink.valid_until'), diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 311c898a5..23871635d 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -99,7 +99,7 @@ export default { return value + ' GDD' }, }, - { key: 'memo', label: this.$t('text') }, + { key: 'memo', label: this.$t('text'), class: 'text-break' }, { key: 'date', label: this.$t('date'), From 89d5d3b3cbbc70d026264097be6f5e5c7855d20c Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 19 Jan 2023 15:16:22 +0100 Subject: [PATCH 4/9] fixed error --- frontend/src/components/Inputs/InputTextarea.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Inputs/InputTextarea.vue b/frontend/src/components/Inputs/InputTextarea.vue index 4096a1b09..3881c4b16 100644 --- a/frontend/src/components/Inputs/InputTextarea.vue +++ b/frontend/src/components/Inputs/InputTextarea.vue @@ -18,7 +18,7 @@ rows="4" max-rows="4" :disabled="disabled" - no-resize="true" + no-resize > {{ errors[0] }} From 7349a9bdd1aaed82f499e52098b278d126ab1ecd Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 19 Jan 2023 15:24:54 +0100 Subject: [PATCH 5/9] add localation in toast --- frontend/src/locales/de.json | 3 ++- frontend/src/locales/en.json | 3 ++- frontend/src/pages/Community.vue | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index ce9f8b41d..d4f1544b9 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -37,7 +37,8 @@ "contribution": { "activity": "Tätigkeit", "alert": { - "answerQuestion": "Bitte beantworte die Rückfrage!", + "answerQuestionToast": "Du hast eine Rückfrage auf einen Beitrag. Bitte antworte auf diese.", + "answerQuestion": "Bitte beantworte diese Rückfrage.", "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.", "confirm": "bestätigt", "deleted": "gelöscht", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 5841c759c..d45502df1 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -37,7 +37,8 @@ "contribution": { "activity": "Activity", "alert": { - "answerQuestion": "Please answer the question", + "answerQuestionToast": "You have a question about a post. Please reply to it.", + "answerQuestion": "Please answer the question.", "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.", "confirm": "confirmed", "deleted": "deleted", diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue index 13aad1a72..5e4186c21 100644 --- a/frontend/src/pages/Community.vue +++ b/frontend/src/pages/Community.vue @@ -282,7 +282,7 @@ export default { if (this.$route.hash !== '#my') { this.$router.push({ path: '/community#my' }) } - this.toastInfo('Du hast eine Rückfrage auf eine Contribution. Bitte beantworte diese!') + this.toastInfo(this.$t('contribution.alert.answerQuestionToast')) } }) .catch((err) => { From 31b7e090170b840b2dc95a480c418996d1bfb753 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 19 Jan 2023 15:33:38 +0100 Subject: [PATCH 6/9] fix error handling to throw proper errors --- frontend/test/testSetup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/test/testSetup.js b/frontend/test/testSetup.js index 06e84b269..27317425f 100644 --- a/frontend/test/testSetup.js +++ b/frontend/test/testSetup.js @@ -70,6 +70,6 @@ console.warn = (m) => { } // throw errors for vue warnings to force the programmers to take care about warnings -Vue.config.warnHandler = (w) => { +Vue.config.warnHandler = async (w) => { throw new Error(w) } From aa5a6e071130cc4363970f4db558247478c17c42 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 19 Jan 2023 15:37:41 +0100 Subject: [PATCH 7/9] fix locales --- frontend/src/locales/de.json | 2 +- frontend/src/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index d4f1544b9..406f2564a 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -37,8 +37,8 @@ "contribution": { "activity": "Tätigkeit", "alert": { - "answerQuestionToast": "Du hast eine Rückfrage auf einen Beitrag. Bitte antworte auf diese.", "answerQuestion": "Bitte beantworte diese Rückfrage.", + "answerQuestionToast": "Du hast eine Rückfrage auf einen Beitrag. Bitte antworte auf diese.", "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.", "confirm": "bestätigt", "deleted": "gelöscht", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index d45502df1..16d4a414b 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -37,8 +37,8 @@ "contribution": { "activity": "Activity", "alert": { - "answerQuestionToast": "You have a question about a post. Please reply to it.", "answerQuestion": "Please answer the question.", + "answerQuestionToast": "You have a question about a post. Please reply to it.", "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.", "confirm": "confirmed", "deleted": "deleted", From 0b7fdac38a8c96b06d9dabe04502f0ce8e79017a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 19 Jan 2023 18:24:00 +0100 Subject: [PATCH 8/9] removed comment --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dfac48371..412154b04 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,7 +35,6 @@ jobs: build_test_admin: name: Docker Build Test - Admin Interface runs-on: ubuntu-latest - #needs: [nothing] steps: ########################################################################## # CHECKOUT CODE ########################################################## From 62e76e02ad3114a3c269d3a5850f0ab9bf7eedb2 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 19 Jan 2023 22:11:20 +0100 Subject: [PATCH 9/9] v1.17.1 --- CHANGELOG.md | 16 ++++++++++++++++ admin/package.json | 2 +- backend/package.json | 2 +- database/package.json | 2 +- frontend/package.json | 2 +- package.json | 2 +- 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 165ed53e5..358e4670a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,24 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [1.17.1](https://github.com/gradido/gradido/compare/1.17.0...1.17.1) + +- refactor(frontend): change contribution memo add word-break [`#2583`](https://github.com/gradido/gradido/pull/2583) +- refactor(admin): add text-break on all table memo fields [`#2584`](https://github.com/gradido/gradido/pull/2584) +- fix(frontend): throw proper frontend warning errors [`#2586`](https://github.com/gradido/gradido/pull/2586) +- refactor(frontend): equalize en with fr languages. [`#2585`](https://github.com/gradido/gradido/pull/2585) +- refactor(frontend): forgot password unit tests [`#2582`](https://github.com/gradido/gradido/pull/2582) +- fix(frontend): fix min value for hours input [`#2581`](https://github.com/gradido/gradido/pull/2581) +- fix(frontend): change dropdown placement calender no-flip true [`#2580`](https://github.com/gradido/gradido/pull/2580) +- refactor(frontend): link send result style [`#2577`](https://github.com/gradido/gradido/pull/2577) +- refactor(frontend): remove vertical scrolling & small fixes [`#2578`](https://github.com/gradido/gradido/pull/2578) +- refactor(frontend): tyle mobile device auth template [`#2576`](https://github.com/gradido/gradido/pull/2576) + #### [1.17.0](https://github.com/gradido/gradido/compare/1.16.0...1.17.0) +> 18 January 2023 + +- chore(release): v1.17.0 [`#2575`](https://github.com/gradido/gradido/pull/2575) - fix(frontend): submit contribution text [`#2573`](https://github.com/gradido/gradido/pull/2573) - fix(backend): admin cannot delete confirmed contribution [`#2571`](https://github.com/gradido/gradido/pull/2571) - fix(frontend): english locales - horas -> hours [`#2572`](https://github.com/gradido/gradido/pull/2572) diff --git a/admin/package.json b/admin/package.json index aabe002b4..8270c4da6 100644 --- a/admin/package.json +++ b/admin/package.json @@ -3,7 +3,7 @@ "description": "Administraion Interface for Gradido", "main": "index.js", "author": "Moriz Wahl", - "version": "1.17.0", + "version": "1.17.1", "license": "Apache-2.0", "private": false, "scripts": { diff --git a/backend/package.json b/backend/package.json index cd0a8f6bc..bfcd61d5b 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "gradido-backend", - "version": "1.17.0", + "version": "1.17.1", "description": "Gradido unified backend providing an API-Service for Gradido Transactions", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/backend", diff --git a/database/package.json b/database/package.json index 6fc745500..f4e1c7e84 100644 --- a/database/package.json +++ b/database/package.json @@ -1,6 +1,6 @@ { "name": "gradido-database", - "version": "1.17.0", + "version": "1.17.1", "description": "Gradido Database Tool to execute database migrations", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/database", diff --git a/frontend/package.json b/frontend/package.json index 55e28b45c..02a6aa2f0 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue-gradido-wallet", - "version": "1.17.0", + "version": "1.17.1", "private": true, "scripts": { "start": "node run/server.js", diff --git a/package.json b/package.json index 539a13b66..7a01da338 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradido", - "version": "1.17.0", + "version": "1.17.1", "description": "Gradido", "main": "index.js", "repository": "git@github.com:gradido/gradido.git",