diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa516f827..754566658 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,21 @@ 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.13.3](https://github.com/gradido/gradido/compare/1.13.2...1.13.3)
+
+- 2294 contribution links on its own page [`#2312`](https://github.com/gradido/gradido/pull/2312)
+- fix: Change Orange Color [`#2302`](https://github.com/gradido/gradido/pull/2302)
+- fix: Release Statistic Query Runner [`#2320`](https://github.com/gradido/gradido/pull/2320)
+- bug: 2295 remove horizontal scrollbar in admin overview [`#2311`](https://github.com/gradido/gradido/pull/2311)
+- 2292 community information contact [`#2313`](https://github.com/gradido/gradido/pull/2313)
+- bug: 2315 Contribution Month and TEST FAIL in MASTER [`#2316`](https://github.com/gradido/gradido/pull/2316)
+- 2291 add button for close contribution messages box [`#2314`](https://github.com/gradido/gradido/pull/2314)
+
#### [1.13.2](https://github.com/gradido/gradido/compare/1.13.1...1.13.2)
+> 28 October 2022
+
+- release: Version 1.13.2 [`#2307`](https://github.com/gradido/gradido/pull/2307)
- fix: 🍰 Links In Contribution Messages Target Blank [`#2306`](https://github.com/gradido/gradido/pull/2306)
- fix: Link in Contribution Messages [`#2305`](https://github.com/gradido/gradido/pull/2305)
- Refactor: 🍰 Change the query so that we only look on the ``contributions`` table. [`#2217`](https://github.com/gradido/gradido/pull/2217)
diff --git a/admin/package.json b/admin/package.json
index 05972bb33..370f504b8 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -3,7 +3,7 @@
"description": "Administraion Interface for Gradido",
"main": "index.js",
"author": "Moriz Wahl",
- "version": "1.13.2",
+ "version": "1.13.3",
"license": "Apache-2.0",
"private": false,
"scripts": {
diff --git a/admin/src/components/ContentFooter.vue b/admin/src/components/ContentFooter.vue
index bab3f5d12..a875100f6 100644
--- a/admin/src/components/ContentFooter.vue
+++ b/admin/src/components/ContentFooter.vue
@@ -1,7 +1,7 @@
diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js
index 1861c5330..affd018a7 100644
--- a/admin/src/pages/Overview.spec.js
+++ b/admin/src/pages/Overview.spec.js
@@ -1,6 +1,5 @@
import { mount } from '@vue/test-utils'
import Overview from './Overview.vue'
-import { listContributionLinks } from '@/graphql/listContributionLinks.js'
import { communityStatistics } from '@/graphql/communityStatistics.js'
import { listUnconfirmedContributions } from '@/graphql/listUnconfirmedContributions.js'
@@ -36,27 +35,6 @@ const apolloQueryMock = jest
},
},
})
- .mockResolvedValueOnce({
- data: {
- listContributionLinks: {
- links: [
- {
- id: 1,
- name: 'Meditation',
- memo: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut l',
- amount: '200',
- validFrom: '2022-04-01',
- validTo: '2022-08-01',
- cycle: 'täglich',
- maxPerCycle: '3',
- maxAmountPerMonth: 0,
- link: 'https://localhost/redeem/CL-1a2345678',
- },
- ],
- count: 1,
- },
- },
- })
.mockResolvedValue({
data: {
listUnconfirmedContributions: [
@@ -118,14 +96,6 @@ describe('Overview', () => {
)
})
- it('calls listContributionLinks', () => {
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- query: listContributionLinks,
- }),
- )
- })
-
it('commits three pending creations to store', () => {
expect(storeCommitMock).toBeCalledWith('setOpenCreations', 3)
})
diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue
index cfa247b8e..57bf7ff8c 100644
--- a/admin/src/pages/Overview.vue
+++ b/admin/src/pages/Overview.vue
@@ -28,31 +28,21 @@
-
diff --git a/admin/src/router/router.test.js b/admin/src/router/router.test.js
index eb9b646cb..22273c15b 100644
--- a/admin/src/router/router.test.js
+++ b/admin/src/router/router.test.js
@@ -45,7 +45,7 @@ describe('router', () => {
describe('routes', () => {
it('has seven routes defined', () => {
- expect(routes).toHaveLength(7)
+ expect(routes).toHaveLength(8)
})
it('has "/overview" as default', async () => {
@@ -81,6 +81,13 @@ describe('router', () => {
})
})
+ describe('contribution-links', () => {
+ it('loads the "ContributionLinks" component', async () => {
+ const component = await routes.find((r) => r.path === '/contribution-links').component()
+ expect(component.default.name).toBe('ContributionLinks')
+ })
+ })
+
describe('not found page', () => {
it('renders the "NotFound" component', async () => {
const component = await routes.find((r) => r.path === '*').component()
diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js
index 72e7b1ac5..ee82f128e 100644
--- a/admin/src/router/routes.js
+++ b/admin/src/router/routes.js
@@ -23,6 +23,10 @@ const routes = [
path: '/creation-confirm',
component: () => import('@/pages/CreationConfirm.vue'),
},
+ {
+ path: '/contribution-links',
+ component: () => import('@/pages/ContributionLinks.vue'),
+ },
{
path: '*',
component: () => import('@/components/NotFoundPage.vue'),
diff --git a/backend/package.json b/backend/package.json
index 45ae2897f..77d3b8064 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
{
"name": "gradido-backend",
- "version": "1.13.2",
+ "version": "1.13.3",
"description": "Gradido unified backend providing an API-Service for Gradido Transactions",
"main": "src/index.ts",
"repository": "https://github.com/gradido/gradido/backend",
diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts
index b0c061d91..7bfae319e 100644
--- a/backend/src/graphql/resolver/StatisticsResolver.ts
+++ b/backend/src/graphql/resolver/StatisticsResolver.ts
@@ -63,6 +63,8 @@ export class StatisticsResolver {
.where('transaction.decay IS NOT NULL')
.getRawOne()
+ await queryRunner.release()
+
return {
totalUsers,
activeUsers,
diff --git a/database/package.json b/database/package.json
index f24bb4150..096c7a9bd 100644
--- a/database/package.json
+++ b/database/package.json
@@ -1,6 +1,6 @@
{
"name": "gradido-database",
- "version": "1.13.2",
+ "version": "1.13.3",
"description": "Gradido Database Tool to execute database migrations",
"main": "src/index.ts",
"repository": "https://github.com/gradido/gradido/database",
diff --git a/frontend/package.json b/frontend/package.json
index ff3237b35..4e983d716 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "bootstrap-vue-gradido-wallet",
- "version": "1.13.2",
+ "version": "1.13.3",
"private": true,
"scripts": {
"start": "node run/server.js",
diff --git a/frontend/src/assets/scss/custom/gradido-custom/_color.scss b/frontend/src/assets/scss/custom/gradido-custom/_color.scss
index 20fcbefd6..f42555adf 100644
--- a/frontend/src/assets/scss/custom/gradido-custom/_color.scss
+++ b/frontend/src/assets/scss/custom/gradido-custom/_color.scss
@@ -33,7 +33,9 @@ $indigo: #5603ad !default;
$purple: #8965e0 !default;
$pink: #f3a4b5 !default;
$red: #f5365c !default;
-$orange: #fb6340 !default;
+
+// $orange: #fb6340 !default;
+$orange: #8c0505 !default;
$yellow: #ffd600 !default;
$green: #2dce89 !default;
$teal: #11cdef !default;
diff --git a/package.json b/package.json
index 95fdb714e..8e5fcfc70 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "gradido",
- "version": "1.13.2",
+ "version": "1.13.3",
"description": "Gradido",
"main": "index.js",
"repository": "git@github.com:gradido/gradido.git",