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
11,514 Commits 1 Branch 0 Tags
Commit Graph

11514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
f74b1a7024 Merge branch 'master' of github.com:gradido/gradido into 2466-design-HTML-emails-and-adjust-texts 2022-12-22 11:38:43 +01:00
Wolfgang Huß
254e0410f5 Fix tests for emails 2022-12-22 11:22:39 +01:00
Wolfgang Huß
aa19a4a3b4 Add imprint logo to emails 
- Remove big space under 'Hello XXX' line.
 2022-12-22 11:11:51 +01:00
mahula
ac32c3a6d5
Merge pull request #2471 from gradido/2435-bug-when-undeleting-an-user-two-success-toasts 
fix(admin): reduce triggers of success toast on deleted user form to exactly one
 2022-12-22 09:34:28 +01:00
Wolfgang Huß
a30b2b0752 Change German sentence spelling and Gradido plural in email subject 2022-12-20 16:18:20 +01:00
Wolfgang Huß
53a4d469d9 Remove text part 'by entering your email address' from two emails 2022-12-20 15:41:08 +01:00
Wolfgang Huß
cd6a6df123 Implement sender name and amount in subject of email 'transactionReceived' 2022-12-20 15:36:47 +01:00
Wolfgang Huß
9b4c8fe610 Fix missing email parameters 'supportEmail', 'communityURL' 2022-12-20 15:03:52 +01:00
Wolfgang Huß
2f650ce172 Fix missing email imprint locale 2022-12-20 15:03:00 +01:00
Wolfgang Huß
9da21a5cfb Replace greeting formular by include and add imprint by this 2022-12-20 14:06:25 +01:00
Wolfgang Huß
9314f8e427 Replace hello line in emails by include 2022-12-20 14:03:48 +01:00
Wolfgang Huß
70d080cf84 Remove 'span' tag from emails 2022-12-20 14:00:47 +01:00
Wolfgang Huß
dd760a650b Add imprint to 'accountMultiRegistration' 2022-12-20 13:59:41 +01:00
Wolfgang Huß
d1f0ae7fa1 Increase frontend and backend 'CONFIG_VERSION' in 'bare_metal' 2022-12-20 11:52:11 +01:00
Wolfgang Huß
2b0db81793 Rename 'SUPPORT_MAIL' to 'COMMUNITY_SUPPORT_MAIL' in frontend 
- Increase frontend 'CONFIG_VERSION'.
 2022-12-20 11:50:47 +01:00
Wolfgang Huß
b89870c813 Implement 'COMMUNITY_SUPPORT_MAIL' in backend 
- Increase backend 'CONFIG_VERSION'.
 2022-12-20 11:49:00 +01:00
mahula
e45e022233
Merge branch 'master' into 2435-bug-when-undeleting-an-user-two-success-toasts 2022-12-20 08:01:23 +01:00
mahula
8f73e76e4f
Merge pull request #2470 from gradido/2457-refactor-move-nginx-docker-build-back-to-first-row-in-workflow 
refactor(other):  build nginx docker image in workflow independent of other builds
 2022-12-19 22:30:40 +01:00
mahula
3d220a99f5 remove success toast from deleted user form 2022-12-16 16:38:48 +01:00
mahula
b7ba244f28 remove unnecessary build dependencies from nginx in github test workflow 2022-12-16 14:32:49 +01:00
Moriz Wahl
e4e698b082
Merge pull request #2467 from gradido/release-v1.16.0 
feat(release): version 1.16.0
 2022-12-15 18:31:22 +01:00
Moriz Wahl
78a780568a feat(release): version 1.16.0 2022-12-15 17:07:35 +01:00
jjimenezgarcia
a15b985c82
Merge pull request #2426 from gradido/clear-old-password-junk 
refactor(backend): cleaning user related old password junk
 2022-12-15 16:12:44 +01:00
Moriz Wahl
1320c962ac Merge branch 'clear-old-password-junk' of github.com:gradido/gradido into clear-old-password-junk 2022-12-15 13:04:48 +01:00
Moriz Wahl
ce0e306284 remove unused import 2022-12-15 13:03:23 +01:00
Moriz Wahl
873076ebfc remove unused import 2022-12-15 13:02:19 +01:00
Moriz Wahl
88eeed7530 Merge branch 'master' into clear-old-password-junk 2022-12-15 12:56:34 +01:00
Moriz Wahl
2233bd9b84
Merge pull request #2453 from gradido/consistent-transaction-table 
fix(database): consistent transaction table
 2022-12-15 12:29:18 +01:00
Ulf Gebhardt
97b169da2e
properly typecast and do thing right 2022-12-15 11:49:28 +01:00
Ulf Gebhardt
8afd66088d
Merge branch 'master' into consistent-transaction-table 2022-12-15 11:27:31 +01:00
Ulf Gebhardt
00a7ac4eb5
deleted old comment 2022-12-15 11:18:31 +01:00
Ulf Gebhardt
59b40bf44d
Merge branch 'master' into clear-old-password-junk 
# Conflicts:
#	backend/src/graphql/resolver/TransactionResolver.ts
#	backend/src/graphql/resolver/UserResolver.ts
 2022-12-15 11:17:45 +01:00
Ulf Gebhardt
243fdc16c7
Merge pull request #2416 from gradido/dissolve_admin_resolver 
refactor(backend): dissolve admin resolver
 2022-12-14 17:48:28 +01:00
joseji
798051f360 docker error solved 2022-12-14 00:10:55 +01:00
Moriz Wahl
1229a7f7df change database version 2022-12-13 22:14:06 +01:00
Moriz Wahl
0bcd441837 rename migrations and entity number 2022-12-13 21:26:32 +01:00
joseji
9b97b6c40e removed text files regarding passphrase 2022-12-13 21:16:57 +01:00
Moriz Wahl
b52c62749c include user contact in user context object 2022-12-13 21:07:12 +01:00
Moriz Wahl
7b8d4e5c85 update database version 2022-12-13 20:54:07 +01:00
Moriz Wahl
35f9157f41 Merge branch 'master' into clear-old-password-junk 2022-12-13 20:52:06 +01:00
Moriz Wahl
7470a80818
Merge branch 'master' into consistent-transaction-table 2022-12-13 20:31:13 +01:00
Ulf Gebhardt
330f85e04e
Merge branch 'master' into dissolve_admin_resolver 
# Conflicts:
#	backend/src/graphql/resolver/AdminResolver.ts
 2022-12-13 16:20:30 +01:00
Moriz Wahl
6e766fa76c
Merge pull request #2418 from gradido/test-validation-of-optin-codes 
fix(backend): email verification code never expired
 2022-12-13 16:17:03 +01:00
Moriz Wahl
02656ee117 fix tests after merge 2022-12-13 15:49:41 +01:00
Moriz Wahl
98742c0db1 Merge branch 'master' into test-validation-of-optin-codes 2022-12-13 14:57:15 +01:00
Ulf Gebhardt
f2dadcd93d
Merge branch 'master' into consistent-transaction-table 2022-12-13 10:13:34 +01:00
Hannes Heine
4be546c68e
Merge branch 'master' into dissolve_admin_resolver 2022-12-13 09:01:44 +01:00
Moriz Wahl
907cd03ab8
Merge pull request #2451 from gradido/consistent-user-contacts-table 
fix(database): consistent deleted at bewteen users and user contacts
 2022-12-12 14:58:51 +01:00
Moriz Wahl
04c88a743b
Merge branch 'master' into consistent-user-contacts-table 2022-12-12 13:50:40 +01:00
Moriz Wahl
82d92d9223 Merge branch 'consistent-user-contacts-table' into consistent-transaction-table 2022-12-12 12:46:46 +01:00