Merge branch 'master' into 3264-feature-gms-publish-user-backend-gradido-communities-dialog

CHANGELOG.md

@@ -4,8 +4,28 @@ 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.2.0](https://github.com/gradido/gradido/compare/2.1.1...2.2.0)
+
+- feat(frontend): update news text [`#3279`](https://github.com/gradido/gradido/pull/3279)
+- feat(frontend): use params instead of query for send/identifier route [`#3277`](https://github.com/gradido/gradido/pull/3277)
+- fix(other): deployment bugfixes [`#3276`](https://github.com/gradido/gradido/pull/3276)
+- refactor(other): federation optimize logging, fix bug [`#3272`](https://github.com/gradido/gradido/pull/3272)
+- feat(other): request limit [`#3274`](https://github.com/gradido/gradido/pull/3274)
+- feat(dlt): logging views [`#3270`](https://github.com/gradido/gradido/pull/3270)
+- refactor(other): hetzner cloud deploy, refactor .env [`#3267`](https://github.com/gradido/gradido/pull/3267)
+- refactor(dlt): dlt connector try out dci [`#3223`](https://github.com/gradido/gradido/pull/3223)
+- feat(backend): fill linked_user_gradido_id and linked_user_name for creation transactions [`#3268`](https://github.com/gradido/gradido/pull/3268)
+- feat(frontend): use day for contribution dates [`#3269`](https://github.com/gradido/gradido/pull/3269)
+- feat(backend): fill linked_user_id for creation transactions [`#3266`](https://github.com/gradido/gradido/pull/3266)
+- docs(other): 3258 feature create gms usecase docu [`#3260`](https://github.com/gradido/gradido/pull/3260)
+- fix(frontend): update moderatorChangedMemo [`#3259`](https://github.com/gradido/gradido/pull/3259)
+- chore(other): change filename date-pattern and stop all modules with db-write-access [`#3245`](https://github.com/gradido/gradido/pull/3245)
+
 #### [2.1.1](https://github.com/gradido/gradido/compare/2.0.1...2.1.1)
 
+> 1 December 2023
+
+- chore(release): v2.1.1 [`#3257`](https://github.com/gradido/gradido/pull/3257)
 - feat(admin): wiedervorlage v2 [`#3255`](https://github.com/gradido/gradido/pull/3255)
 - feat(admin): resubmission [`#3252`](https://github.com/gradido/gradido/pull/3252)
 - feat(backend): grant moderator right to edit contribution memo [`#3233`](https://github.com/gradido/gradido/pull/3233)

admin/package.json

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

backend/.env.template

@@ -54,7 +54,7 @@ EMAIL_LINK_VERIFICATION_PATH=$EMAIL_LINK_VERIFICATION_PATH
 EMAIL_LINK_SETPASSWORD_PATH=$EMAIL_LINK_SETPASSWORD_PATH
 EMAIL_LINK_FORGOTPASSWORD_PATH=$EMAIL_LINK_FORGOTPASSWORD_PATH
 EMAIL_LINK_OVERVIEW_PATH=$EMAIL_LINK_OVERVIEW_PATH
-EMAIL_CODE_VALID_TIME=$EMAIL_CODE_VALID_TIME_PATH
+EMAIL_CODE_VALID_TIME=$EMAIL_CODE_VALID_TIME
 EMAIL_CODE_REQUEST_TIME=$EMAIL_CODE_REQUEST_TIME
 
 # Webhook

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/backend",

backend/src/server/createServer.ts

@@ -79,6 +79,8 @@ export const createServer = async (
      */
   })
   app.use(limiter)
+  // because of nginx proxy, needed for limiter
+  app.set('trust proxy', 1)
 
   // bodyparser json
   app.use(json())

database/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Gradido Database Tool to execute database migrations",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",

deployment/bare_metal/.env.dist

@@ -30,7 +30,6 @@ FRONTEND_CONFIG_VERSION=v5.2024-01-08
 ADMIN_CONFIG_VERSION=v2.2024-01-04
 FEDERATION_CONFIG_VERSION=v2.2023-08-24
 FEDERATION_DHT_CONFIG_VERSION=v4.2024-01-17
-
 FEDERATION_DHT_TOPIC=GRADIDO_HUB
 
 # Need adjustments for test system
@@ -120,8 +119,6 @@ NGINX_REWRITE_LEGACY_URLS=false
 DEFAULT_PUBLISHER_ID=2896
 WEBHOOK_ELOPAGE_SECRET=secret
 
-WALLET_AUTH_URL=https://stage1.gradido.net/authenticate?token={token}
-WALLET_URL=https://stage1.gradido.net/login
 
 # GMS
 #GMS_ACTIVE=true

deployment/bare_metal/start.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
-
+# check for parameter
+if [ -z "$1" ]; then
+    echo "Usage: Please provide a branch name as the first argument."
+    exit 1
+fi
 # Find current directory & configure paths
 set -o allexport
 SCRIPT_PATH=$(realpath $0)
@@ -80,7 +84,7 @@ pm2 delete all
 pm2 save
 
 # git
-BRANCH=${1:-master}
+BRANCH=$1
 echo "Starting with git pull - branch:$BRANCH" >> $UPDATE_HTML
 cd $PROJECT_ROOT
 # TODO: this overfetches alot, but ensures we can use start.sh with tags

deployment/hetzner_cloud/install.sh

@@ -1,4 +1,9 @@
 #!/bin/bash
+# check for parameter
+if [ -z "$1" ]; then
+    echo "Usage: Please provide a branch name as the first argument."
+    exit 1
+fi
 
 # Note: This is needed - since there is Summer-Time included in the default server Setup - UTC is REQUIRED for production data
 timedatectl set-timezone UTC

dht-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-dht-node",
-  "version": "2.1.1",
+  "version": "2.2.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": "2.1.1",
+  "version": "2.2.0",
   "description": "Gradido DLT-Connector",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/",

dlt-connector/src/server/createServer.ts

@@ -62,6 +62,8 @@ const createServer = async (
      */
   })
   app.use(limiter)
+  // because of nginx proxy, needed for limiter
+  app.set('trust proxy', 1)
 
   await apollo.start()
   app.use(

federation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-federation",
-  "version": "2.1.1",
+  "version": "2.2.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",

federation/src/server/createServer.ts

@@ -84,6 +84,8 @@ export const createServer = async (
      */
   })
   app.use(limiter)
+  // because of nginx proxy, needed for limiter
+  app.set('trust proxy', 1)
 
   // bodyparser json
   app.use(express.json())

frontend/package.json

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

package.json

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

scripts/release.sh

@@ -38,4 +38,4 @@ yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version ${
 
 # generate changelog
 cd ${PROJECT_DIR}
-auto-changelog --commit-limit 0 --latest-version ${VERSION}
+./node_modules/.bin/auto-changelog --commit-limit 0 --latest-version ${VERSION}