From 629ee2fdff77e2b3e5c1298f818081b20a43b75c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 31 Oct 2022 08:01:39 +0100
Subject: [PATCH 1/4] remove horizontal scrollbar in admin overview

---
 admin/src/components/ContentFooter.vue        | 4 ++--
 admin/src/components/ContributionLinkList.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 @@
 <template>
   <div class="content-footer">
     <hr />
-    <b-row align-v="center" class="mt-4 justify-content-lg-between">
+    <div align-v="center" class="mt-4 mb-4 justify-content-lg-between">
       <b-col>
         <div class="copyright text-center text-lg-center text-muted">
           {{ $t('footer.copyright.year', { year }) }}
@@ -25,7 +25,7 @@
           </a>
         </div>
       </b-col>
-    </b-row>
+    </div>
   </div>
 </template>
 <script>
diff --git a/admin/src/components/ContributionLinkList.vue b/admin/src/components/ContributionLinkList.vue
index 70a894b16..ef7594fb3 100644
--- a/admin/src/components/ContributionLinkList.vue
+++ b/admin/src/components/ContributionLinkList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="contribution-link-list">
-    <b-table striped hover :items="items" :fields="fields">
+    <b-table :items="items" :fields="fields" striped hover stacked="lg">
       <template #cell(delete)="data">
         <b-button
           variant="danger"

From df8b1623ac8efada494eacfd29e50d5ae5bdf8c9 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 31 Oct 2022 12:50:37 +0100
Subject: [PATCH 2/4] Contact email under own heading

---
 frontend/src/locales/de.json         | 1 +
 frontend/src/locales/en.json         | 1 +
 frontend/src/pages/InfoStatistic.vue | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index a9aee274d..b5736d3e0 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -31,6 +31,7 @@
     "submitContribution": "Beitrag einreichen",
     "switch-to-this-community": "zu dieser Gemeinschaft wechseln"
   },
+  "contact":"Kontakt",
   "contribution": {
     "activity": "Tätigkeit",
     "alert": {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index d9f69581d..e947965d7 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -31,6 +31,7 @@
     "submitContribution": "Submit contribution",
     "switch-to-this-community": "Switch to this community"
   },
+  "contact":"Contact",
   "contribution": {
     "activity": "Activity",
     "alert": {
diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue
index de4b9e224..9b3b4dff5 100644
--- a/frontend/src/pages/InfoStatistic.vue
+++ b/frontend/src/pages/InfoStatistic.vue
@@ -44,6 +44,9 @@
           {{ item.firstName }} {{ item.lastName }}
         </li>
       </ul>
+    </b-container>
+    <b-container>
+      <div class="h3">{{ $t('contact') }}</div>
       <b-link href="mailto: abc@example.com">{{ supportMail }}</b-link>
     </b-container>
     <!-- 

From cc538b609fbb38ed1887a384e2b7bf3906d37507 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 31 Oct 2022 12:51:21 +0100
Subject: [PATCH 3/4] fix locales && lint

---
 frontend/src/locales/de.json | 2 +-
 frontend/src/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index b5736d3e0..5304881c4 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -31,7 +31,7 @@
     "submitContribution": "Beitrag einreichen",
     "switch-to-this-community": "zu dieser Gemeinschaft wechseln"
   },
-  "contact":"Kontakt",
+  "contact": "Kontakt",
   "contribution": {
     "activity": "Tätigkeit",
     "alert": {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index e947965d7..9fa2a1634 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -31,7 +31,7 @@
     "submitContribution": "Submit contribution",
     "switch-to-this-community": "Switch to this community"
   },
-  "contact":"Contact",
+  "contact": "Contact",
   "contribution": {
     "activity": "Activity",
     "alert": {

From fdd3b0f4fdc5fe7a00aa3958ad5b3cb705c659d4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 1 Nov 2022 14:30:43 +0100
Subject: [PATCH 4/4] fix: Release Statistic Query Runner

---
 backend/src/graphql/resolver/StatisticsResolver.ts | 2 ++
 1 file changed, 2 insertions(+)

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,