Merge branch 'master' into remove_email_sender

CHANGELOG.md

@@ -4,8 +4,27 @@ 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).
 
+#### [2.0.0](https://github.com/gradido/gradido/compare/1.23.3...2.0.0)
+
+- feat(federation): x-com-sendcoins 32: communtiy authentication handshake [`#3220`](https://github.com/gradido/gradido/pull/3220)
+- docs(frontend): update news on wallet start page [`#3221`](https://github.com/gradido/gradido/pull/3221)
+- feat(backend): x-com-sendcoins 31: insert recipient as foreign user in users table after x com sendcoins [`#3215`](https://github.com/gradido/gradido/pull/3215)
+- feat(frontend): tunnel community UUId to send [`#3216`](https://github.com/gradido/gradido/pull/3216)
+
 #### [1.23.3](https://github.com/gradido/gradido/compare/1.23.2...1.23.3)
 
+> 6 October 2023
+
+- chore(release): v1.23.3 [`#3205`](https://github.com/gradido/gradido/pull/3205)
+- refactor(backend): x-sendcoins-3: refactor transactionResolver to distingue between local and x-com-transaction [`#3200`](https://github.com/gradido/gradido/pull/3200)
+- feat(federation): x-com sendcoins 23: invoke settlement of pending tx [`#3194`](https://github.com/gradido/gradido/pull/3194)
+- fix(database): update mariadb image name [`#3212`](https://github.com/gradido/gradido/pull/3212)
+- feat(dlt): add community, use dlt-database [`#3207`](https://github.com/gradido/gradido/pull/3207)
+- feat(dlt): protobuf entities for blockchain protocol [`#3199`](https://github.com/gradido/gradido/pull/3199)
+- fix(frontend): make invisible community visible [`#3210`](https://github.com/gradido/gradido/pull/3210)
+- feat(federation): x-com sendcoins 22: add graphql endpoints for revert pending tx [`#3193`](https://github.com/gradido/gradido/pull/3193)
+- feat(federation): x-com sendcoins 21: add graphql endpoints for starting tx 2-phase-commit handshake [`#3192`](https://github.com/gradido/gradido/pull/3192)
+- feat(database): dlt database  [`#3189`](https://github.com/gradido/gradido/pull/3189)
 - feat(backend): x-sendcoins: filter on authenticated communities for selection [`#3203`](https://github.com/gradido/gradido/pull/3203)
 - feat(frontend): make community switch looking similar to other inputs [`#3202`](https://github.com/gradido/gradido/pull/3202)
 - fix(frontend): prevent showing edit link in contribution community view [`#3197`](https://github.com/gradido/gradido/pull/3197)

admin/package.json

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

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.23.3",
+  "version": "2.0.0",
   "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.23.3",
+  "version": "2.0.0",
   "description": "Gradido Database Tool to execute database migrations",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",

dht-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-dht-node",
-  "version": "1.23.3",
+  "version": "2.0.0",
   "description": "Gradido dht-node module",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/",

dlt-connector/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-dlt-connector",
-  "version": "1.23.3",
+  "version": "2.0.0",
   "description": "Gradido DLT-Connector",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/",

federation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-federation",
-  "version": "1.23.3",
+  "version": "2.0.0",
   "description": "Gradido federation module providing Gradido-Hub-Federation and versioned API for inter community communication",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/federation",

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.23.3",
+  "version": "2.0.0",
   "private": true,
   "scripts": {
     "start": "node run/server.js",

frontend/src/graphql/queries.js

@@ -241,6 +241,7 @@ export const searchAdminUsers = gql`
       userList {
         firstName
         lastName
+        role
       }
     }
   }

frontend/src/locales/de.json

@@ -20,6 +20,7 @@
   },
   "back": "Zurück",
   "community": {
+    "admins": "Administratoren",
     "choose-another-community": "Eine andere Gemeinschaft auswählen",
     "community": "Gemeinschaft",
     "communityMember": "Du bist aktives Mitglied",
@@ -27,9 +28,6 @@
     "moderator": "Moderator",
     "moderators": "Moderatoren",
     "myContributions": "Meine Beiträge",
-    "noOpenContributionLinkText": "Zur Zeit gibt es keine per Link erzeugte Schöpfungen.",
-    "openContributionLinks": "Per Link erzeugte Schöpfungen",
-    "openContributionLinkText": "Für Startguthaben oder ähnliche Zwecke kann die Gemeinschaft so genannte Schöpfungs-Links erstellen. Sie lösen automatische Schöpfungen aus, die dem Benutzer gut geschrieben werden.\nDie Gemeinschaft „{name}“ unterstützt aktuell {count} per Link erzeugte Schöpfungen:",
     "startNewsButton": "Gradidos versenden",
     "submitContribution": "Schreiben"
   },
@@ -77,8 +75,7 @@
     "yourActivity": "Bitte trage eine Tätigkeit ein!"
   },
   "contribution-link": {
-    "thanksYouWith": "dankt dir mit",
-    "unique": "(einmalig)"
+    "thanksYouWith": "dankt dir mit"
   },
   "contributionText": "Beitragstext",
   "creation": "Schöpfen",

frontend/src/locales/en.json

@@ -20,6 +20,7 @@
   },
   "back": "Back",
   "community": {
+    "admins": "Administrators",
     "choose-another-community": "Choose another community",
     "community": "Community",
     "communityMember": "You are an active member",
@@ -27,9 +28,6 @@
     "moderator": "Moderator",
     "moderators": "Moderators",
     "myContributions": "My contributions",
-    "noOpenContributionLinkText": "Currently there are no link-generated creations.",
-    "openContributionLinks": "Creations generated by link",
-    "openContributionLinkText": "For starting credits or similar purposes, the community can create so-called creation links. They trigger automatic creations that are credited to the user.\nThe \"{name}\" community currently supports {count} link-generated creations:",
     "startNewsButton": "Send Gradidos",
     "submitContribution": "Contribute"
   },
@@ -77,8 +75,7 @@
     "yourActivity": "Please enter an activity!"
   },
   "contribution-link": {
-    "thanksYouWith": "thanks you with",
-    "unique": "(unique)"
+    "thanksYouWith": "thanks you with"
   },
   "contributionText": "Contribution Text",
   "creation": "Creation",

frontend/src/locales/es.json

@@ -18,6 +18,7 @@
   },
   "back": "Volver",
   "community": {
+    "admins": "Administradores",
     "choose-another-community": "Escoger otra comunidad",
     "community": "Comunidad",
     "continue-to-registration": "Continuar con el registro",

frontend/src/locales/fr.json

@@ -20,6 +20,7 @@
   },
   "back": "Retour",
   "community": {
+    "admins": "Administrateurs",
     "choose-another-community": "Choisissez une autre communauté",
     "community": "Communauté",
     "communityMember": "Vous etes un membre actif",

frontend/src/locales/nl.json

@@ -18,6 +18,7 @@
   },
   "back": "Terug",
   "community": {
+    "admins": "Beheerders",
     "choose-another-community": "Kies een andere gemeenschap",
     "community": "Gemeenschap",
     "continue-to-registration": "Verder ter registratie",

frontend/src/locales/tr.json

@@ -20,6 +20,7 @@
   },
   "back": "Geri",
   "community": {
+    "admins": "Yöneticiler",
     "choose-another-community": "Başka bir topluluk seçin",
     "community": "Topluluk",
     "continue-to-registration": "Kayıt işlemine devam et",

frontend/src/pages/InfoStatistic.vue

@@ -11,7 +11,7 @@
         </b-link>
       </div>
       <hr />
-      <div class="h3">{{ $t('community.openContributionLinks') }}</div>
+      <!--<div class="h3">{{ $t('community.openContributionLinks') }}</div>
       <div v-if="count > 0">
         {{
           $t('community.openContributionLinkText', {
@@ -34,13 +34,15 @@
         </li>
       </ul>
 
-      <hr />
+      <hr />-->
 
+      <div class="h3">{{ $t('community.admins') }}</div>
+      <ul>
+        <li v-for="item in admins" :key="item.id">{{ item.firstName }} {{ item.lastName }}</li>
+      </ul>
       <div class="h3">{{ $t('community.moderators') }}</div>
       <ul>
-        <li v-for="item in itemsAdminUser" v-bind:key="item.id">
-          {{ item.firstName }} {{ item.lastName }}
-        </li>
+        <li v-for="item in moderators" :key="item.id">{{ item.firstName }} {{ item.lastName }}</li>
       </ul>
 
       <hr />
@@ -96,6 +98,14 @@ export default {
       totalGradidoAvailable: null,
     }
   },
+  computed: {
+    admins() {
+      return this.itemsAdminUser.filter((item) => item.role === 'ADMIN')
+    },
+    moderators() {
+      return this.itemsAdminUser.filter((item) => item.role === 'MODERATOR')
+    },
+  },
   methods: {
     getContributionLinks() {
       this.$apollo

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.23.3",
+  "version": "2.0.0",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",
@@ -8,7 +8,7 @@
   "license": "Apache-2.0",
   "scripts": {
     "release": "scripts/release.sh",
-    "installAll": "yarn && cd database && yarn && cd ../frontend && yarn && cd ../admin && yarn && cd ../backend && yarn && cd ../e2e-tests && yarn && cd ../federation && yarn && cd ../dht-node && yarn && cd .."
+    "installAll": "yarn && cd database && yarn && cd ../frontend && yarn && cd ../admin && yarn && cd ../backend && yarn && cd ../federation && yarn && cd ../dht-node && yarn && cd ../e2e-tests && yarn && cd .."
   },
   "dependencies": {
     "auto-changelog": "^2.4.0",