Merge branch 'master' into unit-tests-community-page

.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 ##########################################################

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)

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

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

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

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

frontend/src/components/Contributions/ContributionListItem.vue

@@ -16,12 +16,15 @@
           <b-avatar v-else :icon="icon" :variant="variant" size="3em"></b-avatar>
         </b-col>
         <b-col>
-          <div v-if="firstName" class="mr-3 font-weight-bold">{{ firstName }} {{ lastName }}</div>
+          <div v-if="firstName" class="mr-3 font-weight-bold">
+            {{ firstName }} {{ lastName }}
+            <b-icon :icon="icon" :variant="variant"></b-icon>
+          </div>
           <div class="small">
             {{ $d(new Date(contributionDate), 'monthAndYear') }}
           </div>
           <div class="mt-3 font-weight-bold">{{ $t('contributionText') }}</div>
-          <div class="mb-3">{{ memo }}</div>
+          <div class="mb-3 text-break word-break">{{ memo }}</div>
           <div v-if="state === 'IN_PROGRESS'" class="text-205">
             {{ $t('contribution.alert.answerQuestion') }}
           </div>

frontend/src/components/Inputs/InputTextarea.vue

@@ -18,6 +18,7 @@
         rows="4"
         max-rows="4"
         :disabled="disabled"
+        no-resize
       ></b-form-textarea>
       <b-form-invalid-feedback v-bind="ariaMsg">
         {{ errors[0] }}

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

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

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

frontend/src/pages/Community.vue

@@ -146,7 +146,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'))
          }
        },
        error({ message }) {

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