diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 54653b831..1db851030 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 ########################################################## 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 705dea0b2..29c440988 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/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') }}
diff --git a/frontend/src/components/Inputs/InputTextarea.vue b/frontend/src/components/Inputs/InputTextarea.vue index e8dcf2840..3881c4b16 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 > {{ errors[0] }} diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index ce9f8b41d..406f2564a 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!", + "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 5841c759c..16d4a414b 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", + "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", diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js index 379994b73..2beec7571 100644 --- a/frontend/src/pages/Community.spec.js +++ b/frontend/src/pages/Community.spec.js @@ -250,7 +250,7 @@ describe('Community', () => { it('toasts an info', () => { expect(toastInfoSpy).toBeCalledWith( - 'Du hast eine Rückfrage auf eine Contribution. Bitte beantworte diese!', + 'contribution.alert.answerQuestionToast', ) }) }) diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue index 5bfa4f99a..a17466840 100644 --- a/frontend/src/pages/Community.vue +++ b/frontend/src/pages/Community.vue @@ -48,258 +48,258 @@