IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into add_hide_amount_to_users

Browse Source
This commit is contained in:
Alexander Friedland 2023-01-10 09:10:50 +01:00 committed by GitHub
commit 11c2b3900c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/lint_pr.yml vendored
View File

@ -29,6 +29,9 @@ jobs:
admin admin
database database
release release
federation
workflow
docker
other other
# Configure that a scope must always be provided. # Configure that a scope must always be provided.
requireScope: true requireScope: true

2
backend/.env.dist
View File

@ -66,5 +66,5 @@ EVENT_PROTOCOL_DISABLED=false
# if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen # if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen
# on an hash created from this topic # on an hash created from this topic
# FEDERATION_DHT_TOPIC=GRADIDO_HUB # FEDERATION_DHT_TOPIC=GRADIDO_HUB
# FEDERATION_DHT_SEED=64ebcb0e3ad547848fef4197c6e2332f # FEDERATION_DHT_SEED=64ebcb0e3ad547848fef4197c6e2332f
# FEDERATION_COMMUNITY_URL=http://localhost:4000/api # FEDERATION_COMMUNITY_URL=http://localhost:4000/api

2
backend/src/config/index.ts
View File

@ -17,7 +17,7 @@ const constants = {
LOG_LEVEL: process.env.LOG_LEVEL || 'info', LOG_LEVEL: process.env.LOG_LEVEL || 'info',
CONFIG_VERSION: { CONFIG_VERSION: {
DEFAULT: 'DEFAULT', DEFAULT: 'DEFAULT',
EXPECTED: 'v14.2022-11-22', EXPECTED: 'v14.2022-12-22',
CURRENT: '', CURRENT: '',
}, },
} }

10
backend/src/emails/sendEmailVariants.test.ts
View File

@ -327,18 +327,20 @@ describe('sendEmailVariants', () => {
to: 'Peter Lustig <peter@lustig.de>', to: 'Peter Lustig <peter@lustig.de>',
from: 'Gradido (do not answer) <info@gradido.net>', from: 'Gradido (do not answer) <info@gradido.net>',
attachments: [], attachments: [],
subject: 'Gradido: Your common good contribution was confirmed', subject: 'Gradido: Your contribution to the common good was confirmed',
html: expect.any(String), html: expect.any(String),
text: expect.stringContaining('GRADIDO: YOUR COMMON GOOD CONTRIBUTION WAS CONFIRMED'), text: expect.stringContaining(
'GRADIDO: YOUR CONTRIBUTION TO THE COMMON GOOD WAS CONFIRMED',
),
}), }),
}) })
expect(result.originalMessage.html).toContain('<!DOCTYPE html>') expect(result.originalMessage.html).toContain('<!DOCTYPE html>')
expect(result.originalMessage.html).toContain('<html lang="en">') expect(result.originalMessage.html).toContain('<html lang="en">')
expect(result.originalMessage.html).toContain( expect(result.originalMessage.html).toContain(
'<title>Gradido: Your common good contribution was confirmed</title>', '<title>Gradido: Your contribution to the common good was confirmed</title>',
) )
expect(result.originalMessage.html).toContain( expect(result.originalMessage.html).toContain(
'>Gradido: Your common good contribution was confirmed</h1>', '>Gradido: Your contribution to the common good was confirmed</h1>',
) )
expect(result.originalMessage.html).toContain('Hello Peter Lustig') expect(result.originalMessage.html).toContain('Hello Peter Lustig')
expect(result.originalMessage.html).toContain( expect(result.originalMessage.html).toContain(

2
backend/src/locales/en.json
View File

@ -21,7 +21,7 @@
}, },
"contributionConfirmed": { "contributionConfirmed": {
"commonGoodContributionConfirmed": "Your public good contribution “{contributionMemo}” has just been confirmed by {senderFirstName} {senderLastName} and credited to your Gradido account.", "commonGoodContributionConfirmed": "Your public good contribution “{contributionMemo}” has just been confirmed by {senderFirstName} {senderLastName} and credited to your Gradido account.",
"subject": "Gradido: Your common good contribution was confirmed" "subject": "Gradido: Your contribution to the common good was confirmed"
}, },
"contributionRejected": { "contributionRejected": {
"commonGoodContributionRejected": "Your public good contribution “{contributionMemo}” was rejected by {senderFirstName} {senderLastName}.", "commonGoodContributionRejected": "Your public good contribution “{contributionMemo}” was rejected by {senderFirstName} {senderLastName}.",

4
backend/src/server/plugins.ts
View File

@ -23,8 +23,8 @@ const setHeadersPlugin = {
const filterVariables = (variables: any) => { const filterVariables = (variables: any) => {
const vars = clonedeep(variables) const vars = clonedeep(variables)
if (vars.password) vars.password = '***' if (vars && vars.password) vars.password = '***'
if (vars.passwordNew) vars.passwordNew = '***' if (vars && vars.passwordNew) vars.passwordNew = '***'
return vars return vars
} }

5
deployment/bare_metal/.env.dist
View File

@ -27,11 +27,10 @@ COMMUNITY_DESCRIPTION="Gradido Development Stage1 Test Community"
COMMUNITY_SUPPORT_MAIL=support@supportmail.com COMMUNITY_SUPPORT_MAIL=support@supportmail.com
# backend # backend
BACKEND_CONFIG_VERSION=v13.2022-12-20 BACKEND_CONFIG_VERSION=v14.2022-12-22
JWT_EXPIRES_IN=10m JWT_EXPIRES_IN=10m
GDT_API_URL=https://gdt.gradido.net GDT_API_URL=https://gdt.gradido.net
ENV_NAME=stage1
TYPEORM_LOGGING_RELATIVE_PATH=../deployment/bare_metal/log/typeorm.backend.log TYPEORM_LOGGING_RELATIVE_PATH=../deployment/bare_metal/log/typeorm.backend.log
@ -64,7 +63,7 @@ EVENT_PROTOCOL_DISABLED=false
# if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen # if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen
# on an hash created from this topic # on an hash created from this topic
# FEDERATION_DHT_TOPIC=GRADIDO_HUB # FEDERATION_DHT_TOPIC=GRADIDO_HUB
# FEDERATION_DHT_SEED=64ebcb0e3ad547848fef4197c6e2332f # FEDERATION_DHT_SEED=64ebcb0e3ad547848fef4197c6e2332f
# database # database
DATABASE_CONFIG_VERSION=v1.2022-03-18 DATABASE_CONFIG_VERSION=v1.2022-03-18