Merge branch 'master' into change-orange-color

This commit is contained in:
Moriz Wahl 2022-11-01 15:27:46 +01:00 committed by GitHub
commit 38e51f6cab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 3 deletions

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="content-footer"> <div class="content-footer">
<hr /> <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> <b-col>
<div class="copyright text-center text-lg-center text-muted"> <div class="copyright text-center text-lg-center text-muted">
{{ $t('footer.copyright.year', { year }) }} {{ $t('footer.copyright.year', { year }) }}
@ -25,7 +25,7 @@
</a> </a>
</div> </div>
</b-col> </b-col>
</b-row> </div>
</div> </div>
</template> </template>
<script> <script>

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="contribution-link-list"> <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"> <template #cell(delete)="data">
<b-button <b-button
variant="danger" variant="danger"

View File

@ -63,6 +63,8 @@ export class StatisticsResolver {
.where('transaction.decay IS NOT NULL') .where('transaction.decay IS NOT NULL')
.getRawOne() .getRawOne()
await queryRunner.release()
return { return {
totalUsers, totalUsers,
activeUsers, activeUsers,

View File

@ -31,6 +31,7 @@
"submitContribution": "Beitrag einreichen", "submitContribution": "Beitrag einreichen",
"switch-to-this-community": "zu dieser Gemeinschaft wechseln" "switch-to-this-community": "zu dieser Gemeinschaft wechseln"
}, },
"contact": "Kontakt",
"contribution": { "contribution": {
"activity": "Tätigkeit", "activity": "Tätigkeit",
"alert": { "alert": {

View File

@ -31,6 +31,7 @@
"submitContribution": "Submit contribution", "submitContribution": "Submit contribution",
"switch-to-this-community": "Switch to this community" "switch-to-this-community": "Switch to this community"
}, },
"contact": "Contact",
"contribution": { "contribution": {
"activity": "Activity", "activity": "Activity",
"alert": { "alert": {

View File

@ -44,6 +44,9 @@
{{ item.firstName }} {{ item.lastName }} {{ item.firstName }} {{ item.lastName }}
</li> </li>
</ul> </ul>
</b-container>
<b-container>
<div class="h3">{{ $t('contact') }}</div>
<b-link href="mailto: abc@example.com">{{ supportMail }}</b-link> <b-link href="mailto: abc@example.com">{{ supportMail }}</b-link>
</b-container> </b-container>
<!-- <!--