Merge branch 'master' into 2095-send-email-contribution-confirmed

CHANGELOG.md

@@ -4,8 +4,56 @@ 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.12.1](https://github.com/gradido/gradido/compare/1.12.0...1.12.1)
+
+- fix: 🍰 Show Not Icons In `allContribution` List [`#2195`](https://github.com/gradido/gradido/pull/2195)
+
+#### [1.12.0](https://github.com/gradido/gradido/compare/1.11.0...1.12.0)
+
+> 12 September 2022
+
+- release: v1.12.0 [`#2191`](https://github.com/gradido/gradido/pull/2191)
+- if message empty else disabled button [`#2189`](https://github.com/gradido/gradido/pull/2189)
+- messages show if Confirmed [`#2185`](https://github.com/gradido/gradido/pull/2185)
+- text in messages smaller [`#2186`](https://github.com/gradido/gradido/pull/2186)
+- feat: 🍰 Klicktipp retrieve not registered email [`#2181`](https://github.com/gradido/gradido/pull/2181)
+- fix: 🍰 isModerator on messages to switch the messages side in the messages overview [`#2182`](https://github.com/gradido/gradido/pull/2182)
+- Refactor locales for Nederlands [`#2174`](https://github.com/gradido/gradido/pull/2174)
+- Add is moderator to contribution message [`#2180`](https://github.com/gradido/gradido/pull/2180)
+- feat: 🍰 Moderator Cannot Answer Himself [`#2178`](https://github.com/gradido/gradido/pull/2178)
+- refactor: Improve Statistics Query [`#2170`](https://github.com/gradido/gradido/pull/2170)
+- fix: Remove Statistics from Wallet [`#2171`](https://github.com/gradido/gradido/pull/2171)
+- feat: 🍰 Contribution Messages In Frontend [`#2164`](https://github.com/gradido/gradido/pull/2164)
+- feat: 🚀 CRUD For Contribution Messages [`#2149`](https://github.com/gradido/gradido/pull/2149)
+- fix: 🍰 Decay Calculation In Community Statistics [`#2167`](https://github.com/gradido/gradido/pull/2167)
+- chore: 🍰 Remove Fetch Policy Network Only From Statistics [`#2159`](https://github.com/gradido/gradido/pull/2159)
+- feat: 🍰 Remove Some Statistics Data From Frontend [`#2153`](https://github.com/gradido/gradido/pull/2153)
+- feat: 🍰 Add Toogle Collaps On Language Name [`#2156`](https://github.com/gradido/gradido/pull/2156)
+- 2145 corrections style for frontend [`#2147`](https://github.com/gradido/gradido/pull/2147)
+- 2072 feature usecase contribution messaging [`#2073`](https://github.com/gradido/gradido/pull/2073)
+- 2151 add hint to redeem link [`#2158`](https://github.com/gradido/gradido/pull/2158)
+- 🍰 Create `contribution messages` table [`#2137`](https://github.com/gradido/gradido/pull/2137)
+- feat: 🍰 Add The Languages French And Dutch [`#2138`](https://github.com/gradido/gradido/pull/2138)
+- 1973 list open contribution links in the wallet [`#1975`](https://github.com/gradido/gradido/pull/1975)
+- feat: 🍰 Admin Interface Displays Statistics [`#2124`](https://github.com/gradido/gradido/pull/2124)
+- feat: Statistics Resolver [`#2041`](https://github.com/gradido/gradido/pull/2041)
+- 2116 retrieve admin and moderators [`#2127`](https://github.com/gradido/gradido/pull/2127)
+- 2125 feature gradido id: new column gradidoid in users table [`#2126`](https://github.com/gradido/gradido/pull/2126)
+- 2119 new menu item gdt [`#2120`](https://github.com/gradido/gradido/pull/2120)
+- feat: Migrate Contributions Table [`#2136`](https://github.com/gradido/gradido/pull/2136)
+- chore: 🍰 Refactor Contribution Form Logic And Write Tests [`#2092`](https://github.com/gradido/gradido/pull/2092)
+- fix: 🍰 Add `emailChecked` Before Changing `optIn` State & Log Error On klicktipp Middleware [`#2107`](https://github.com/gradido/gradido/pull/2107)
+- Add RIGHTS.LIST_CONTRIBUTION_LINKS to ROLE_USER [`#2123`](https://github.com/gradido/gradido/pull/2123)
+- 2121 translate locales to spanish [`#2122`](https://github.com/gradido/gradido/pull/2122)
+- add formatter on input amount replace point and comma [`#2115`](https://github.com/gradido/gradido/pull/2115)
+- remove required from form.memo [`#2114`](https://github.com/gradido/gradido/pull/2114)
+- Fix pagination ellipsis [`#2104`](https://github.com/gradido/gradido/pull/2104)
+
 #### [1.11.0](https://github.com/gradido/gradido/compare/1.10.1...1.11.0)
 
+> 28 July 2022
+
+- release: Version 1.11.0 [`#2103`](https://github.com/gradido/gradido/pull/2103)
 - Fix navbar community item [`#2102`](https://github.com/gradido/gradido/pull/2102)
 - Add validation date info to copied text after transaction link creation [`#2101`](https://github.com/gradido/gradido/pull/2101)
 - Remove member area from menu (desktop and mobile), when user has no elopage account [`#2099`](https://github.com/gradido/gradido/pull/2099)

admin/package.json

@@ -3,7 +3,7 @@
   "description": "Administraion Interface for Gradido",
   "main": "index.js",
   "author": "Moriz Wahl",
-  "version": "1.11.0",
+  "version": "1.12.1",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.11.0",
+  "version": "1.12.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.11.0",
+  "version": "1.12.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.11.0",
+  "version": "1.12.1",
   "private": true,
   "scripts": {
     "start": "node run/server.js",

frontend/src/components/Contributions/ContributionList.vue

@@ -4,6 +4,7 @@
       <contribution-list-item
         v-bind="item"
         :contributionId="item.id"
+        :allContribution="allContribution"
         @update-contribution-form="updateContributionForm"
         @delete-contribution="deleteContribution"
         @update-state="updateState"
@@ -44,6 +45,11 @@ export default {
       required: true,
     },
     pageSize: { type: Number, default: 25 },
+    allContribution: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {

frontend/src/components/Contributions/ContributionListItem.vue

@@ -29,7 +29,7 @@
           <div class="mr-2">{{ memo }}</div>
           <div class="d-flex flex-row-reverse">
             <div
-              v-if="!['CONFIRMED', 'DELETED'].includes(state)"
+              v-if="!['CONFIRMED', 'DELETED'].includes(state) && !allContribution"
               class="pointer ml-5"
               @click="
                 $emit('update-contribution-form', {
@@ -43,7 +43,7 @@
               <b-icon icon="pencil" class="h2"></b-icon>
             </div>
             <div
-              v-if="!['CONFIRMED', 'DELETED'].includes(state)"
+              v-if="!['CONFIRMED', 'DELETED'].includes(state) && !allContribution"
               class="pointer"
               @click="deleteContribution({ id })"
             >
@@ -141,6 +141,11 @@ export default {
       type: Number,
       required: true,
     },
+    allContribution: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {

frontend/src/pages/Community.vue

@@ -73,6 +73,7 @@
             :contributionCount="contributionCountAll"
             :showPagination="true"
             :pageSize="pageSizeAll"
+            :allContribution="true"
           />
         </b-tab>
       </b-tabs>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.11.0",
+  "version": "1.12.1",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",