Merge branch 'master' into 1906-feature-concept-for-gdd-creation-per-linkqr-code

CHANGELOG.md

@@ -4,8 +4,26 @@ 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.10.0](https://github.com/gradido/gradido/compare/1.9.0...1.10.0)
+
+- frontend redeem contribution link [`#1988`](https://github.com/gradido/gradido/pull/1988)
+- change new start picture [`#1990`](https://github.com/gradido/gradido/pull/1990)
+- feat: Redeem Contribution Link [`#1987`](https://github.com/gradido/gradido/pull/1987)
+- fix: Max Amount on Slider for Edit Contribution [`#1986`](https://github.com/gradido/gradido/pull/1986)
+- CRUD contribution link admin interface [`#1981`](https://github.com/gradido/gradido/pull/1981)
+- fix: `.env` log level for apollo and backend category [`#1967`](https://github.com/gradido/gradido/pull/1967)
+- refactor: Admin Pending Creations Table to Contributions Table [`#1949`](https://github.com/gradido/gradido/pull/1949)
+- devops: Update Browser List for Unit Tests as Recomended [`#1984`](https://github.com/gradido/gradido/pull/1984)
+- feat: CRUD for Contribution Links in Admin Resolver [`#1979`](https://github.com/gradido/gradido/pull/1979)
+- 1920 feature create contribution link table [`#1957`](https://github.com/gradido/gradido/pull/1957)
+- refactor: 🍰 Delete `user_setting` Table From DB [`#1960`](https://github.com/gradido/gradido/pull/1960)
+- locales link german, english navbar [`#1969`](https://github.com/gradido/gradido/pull/1969)
+
 #### [1.9.0](https://github.com/gradido/gradido/compare/1.8.3...1.9.0)
 
+> 2 June 2022
+
+- devops: Release Version 1.9.0 [`#1968`](https://github.com/gradido/gradido/pull/1968)
 - refactor: 🍰 Refactor To `filters` Object And Rename Filters Properties [`#1914`](https://github.com/gradido/gradido/pull/1914)
 - refactor register button position [`#1964`](https://github.com/gradido/gradido/pull/1964)
 - fixed redeem link is mobile start false [`#1958`](https://github.com/gradido/gradido/pull/1958)

admin/package.json

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

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.9.0",
+  "version": "1.10.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.9.0",
+  "version": "1.10.0",
   "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.9.0",
+  "version": "1.10.0",
   "private": true,
   "scripts": {
     "start": "node run/server.js",

frontend/src/components/Auth/AuthNavbar.vue

@@ -3,7 +3,7 @@
     <b-navbar toggleable="lg" class="pr-4">
       <b-navbar-brand>
         <b-img
-          class="imgLogo position-absolute ml--3 mt--3 p-2 zindex1000"
+          class="imgLogo position-absolute ml--3 mt-lg--2 mt-3 p-2 zindex1000"
           :src="logo"
           width="200"
           alt="..."
@@ -18,7 +18,7 @@
       <b-img class="sheet-img position-absolute d-block d-lg-none zindex1000" :src="sheet"></b-img>
       <b-navbar-toggle target="nav-collapse" class="zindex1000"></b-navbar-toggle>
 
-      <b-collapse id="nav-collapse" is-nav class="mt-5 mt-lg-0">
+      <b-collapse id="nav-collapse" is-nav class="ml-5">
         <b-navbar-nav class="ml-auto" right>
           <b-nav-item :href="`https://gradido.net/${$i18n.locale}`" target="_blank">
             {{ $t('auth.navbar.aboutGradido') }}
@@ -49,10 +49,18 @@ export default {
   color: #383838 !important;
 }
 
+.navbar-toggler {
+  font-size: 2.25rem;
+}
+
 .authNavbar > .router-link-exact-active {
   color: #0e79bc !important;
 }
 
+button.navbar-toggler > span.navbar-toggler-icon {
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(4, 112, 6, 1)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
+}
+
 .auth-header {
   font-family: 'Open Sans', sans-serif !important;
 }

frontend/src/components/LanguageSwitch2.vue

@@ -4,7 +4,7 @@
       v-for="(lang, index) in locales"
       @click.prevent="saveLocale(lang.code)"
       :key="lang.code"
-      class="pointer pr-3"
+      class="pointer pr-2"
       :class="$store.state.language === lang.code ? 'c-blau' : 'c-grey'"
     >
       <span class="locales">{{ lang.name }}</span>

frontend/src/layouts/AuthLayout.vue

@@ -31,8 +31,8 @@
                 <auth-navbar-small />
               </b-col>
             </b-row>
-            <b-row class="mt-5 pl-2 pl-md-0 pl-lg-0">
-              <b-col cols="9">
+            <b-row class="mt-0 mt-md-5 pl-2 pl-md-0 pl-lg-0">
+              <b-col lg="9" md="9" sm="12">
                 <div class="h1 mb--2">{{ $t('welcome') }}</div>
                 <div class="h1 mb-0">{{ $t('WelcomeBy', { name: communityName }) }}</div>
                 <div class="mb-0">{{ $t('1000thanks') }}</div>

package.json

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