11495 Commits

Author SHA1 Message Date
clauspeterhuebner
1314ed5263
Merge branch 'master' into 2267-feature-gradido-roadmap 2022-11-24 21:22:45 +01:00
Wolfgang Huß
44f2e6b06a Move 'getTimeDurationObject' and 'printTimeDuration' into a separate file 2022-11-24 20:15:55 +01:00
Moriz Wahl
f2e8846932 rename migration file, set new db version in backend 2022-11-24 16:37:32 +01:00
Moriz Wahl
63e22eeab8 fix(database): wrong balance and decay values 2022-11-24 16:30:55 +01:00
Wolfgang Huß
e07a2f88c1 Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables 2022-11-24 16:23:10 +01:00
Wolfgang Huß
3b030e4612 Remove old untranslated email 'sendContributionRejectedEmail' 2022-11-24 16:12:48 +01:00
Wolfgang Huß
ae65af9df8 Test 'sendContributionRejectedEmail' 2022-11-24 16:10:41 +01:00
Wolfgang Huß
72213988ac Refactor 'sendContributionRejectedEmail' email to HTML and translatable 2022-11-24 16:10:29 +01:00
Wolfgang Huß
dd33254acb Remove old untranslated email 'sendContributionConfirmedEmail' 2022-11-24 14:56:09 +01:00
Wolfgang Huß
727e5ca1f6 Test 'sendContributionConfirmedEmail' 2022-11-24 14:45:33 +01:00
Wolfgang Huß
c87ffd5b8a Refactor 'sendContributionConfirmedEmail' email to HTML and translatable 2022-11-24 14:44:50 +01:00
bd28a888a6
Merge branch 'master' into jest_is_dev_depenency 2022-11-24 13:40:59 +01:00
Moriz Wahl
77d93f18fa remove test 2022-11-24 13:13:01 +01:00
Moriz Wahl
b3e880d45f undo refactoring 2022-11-24 13:03:50 +01:00
jjimenezgarcia
8b9eb4a522
Merge pull request #2353 from gradido/new-password-encryption
refactor(backend): new password encryption implementation
2022-11-24 12:00:20 +01:00
jjimenezgarcia
d8f5cda0fc
Merge branch 'master' into new-password-encryption 2022-11-24 11:26:02 +01:00
joseji
2a74b92472 user saving on db 2022-11-24 11:21:47 +01:00
Wolfgang Huß
a82f0a2864 Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables 2022-11-24 11:20:14 +01:00
elweyn
b05c009d6e Merge branch 'master' into 2285-mark-creation-via-link 2022-11-24 09:05:36 +01:00
6f8212fe54
test fix 2022-11-23 23:52:53 +01:00
16e6b0f493
Merge branch 'master' into dissolve_admin_resolver 2022-11-23 23:45:01 +01:00
7b2e6730bd
lint fixes 2022-11-23 23:44:43 +01:00
ecb99bd603
separate Contribution- and TransactionLink Resolvers 2022-11-23 23:37:47 +01:00
a2c1b0ff96
separate AdminResolver.test into the corresponding parts 2022-11-23 22:52:22 +01:00
f4a9aa1a68
Merge branch 'master' into jest_is_dev_depenency 2022-11-23 18:06:20 +01:00
29c4395452
Merge branch 'master' into 2179-bug-wrong-month-for-contribution-near-turn-of-month 2022-11-23 17:57:56 +01:00
a1e8d0b206
Update docu/Concepts/BusinessRequirements/Zeitzonen_Behandlung.md 2022-11-23 17:57:22 +01:00
mahula
66da74c77a
Merge pull request #2399 from gradido/2317-refactor-admin-statistics-on-its-own-page
refactor(admin): statistics in a table and on separate page in admin area
2022-11-23 14:22:36 +01:00
joseji
60e3f62832 enum use on community user initialization 2022-11-23 11:32:27 +01:00
mahula
4dfd78ebd7 adapt unit test to test rendering of the data on admin area statistics page 2022-11-23 08:58:39 +01:00
Moriz Wahl
ea62a7f710 fix(backend): email verification code never expired 2022-11-22 18:01:36 +01:00
Wolfgang Huß
98798d3322 Adjust test of 'sendAddedContributionMessageEmail' in 'ContributionMessageResolver.test.ts' 2022-11-22 17:24:36 +01:00
Wolfgang Huß
a1ec8dfa4f Remove old untranslated email 'sendAddedContributionMessageEmail' 2022-11-22 14:16:10 +01:00
Wolfgang Huß
fb01567169 Test 'sendAddedContributionMessageEmail' in 'sendEmailVariants.test.ts' 2022-11-22 14:13:01 +01:00
mahula
abe61f9c8c adapt unit test for admin area routing 2022-11-22 13:41:09 +01:00
Wolfgang Huß
76fa425529 Refactor 'sendAddedContributionMessageEmail' email to HTML and translatable 2022-11-22 13:18:32 +01:00
mahula
8348d612b6 adapt unit test for admin area statistics page 2022-11-22 13:08:14 +01:00
4554b01b89
order and correct imports of resolvers 2022-11-22 13:01:38 +01:00
db1a11a2b5
seperate admin resolver into existing resolvers 2022-11-22 12:41:08 +01:00
Wolfgang Huß
53b29db25e Add README's for locales – especially for quotation marks 2022-11-22 11:24:13 +01:00
joseji
e55f516c51 removed unused import 2022-11-22 11:19:42 +01:00
Wolfgang Huß
0695ac282b Adjust the fixed 'CONFIG.EMAIL_TEST_MODUS' problem in 'sendEmailTranslated.ts' 2022-11-22 11:17:26 +01:00
joseji
3aeb9dd0f1 fixes added 2022-11-22 11:12:18 +01:00
mahula
7ef66e9da4 remove undefines elements from StatisticTable compoment 2022-11-22 09:17:23 +01:00
mahula
7c4e252757 fix typo in unit test 2022-11-22 09:01:55 +01:00
Wolfgang Huß
624cd6e4bc Fix spelling of error message in 'sendActivationEmail' 2022-11-22 08:34:48 +01:00
41891c1b57
Merge branch 'master' into jest_is_dev_depenency 2022-11-21 17:19:12 +01:00
Wolfgang Huß
b8fdb59d73 Remove old email 'sendAccountActivationEmail' 2022-11-21 13:38:18 +01:00
Wolfgang Huß
18a4408e8a Adjust the tests for new translatable 'sendAccountActivationEmail' 2022-11-21 13:37:29 +01:00
Wolfgang Huß
b78229b646 Fix faulty email content tests 2022-11-21 12:22:25 +01:00