a2c1b0ff96
separate AdminResolver.test into the corresponding parts
2022-11-23 22:52:22 +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ß
cd8c0b88ae
Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates
...
# Conflicts:
# backend/src/graphql/resolver/UserResolver.ts
2022-11-17 13:54:50 +01:00
Moriz Wahl
36185a286a
move clear all mocks to correct position
2022-11-16 14:42:45 +01:00
Moriz Wahl
eac290919d
avoid reverse, restore removed clear mocks
2022-11-16 14:38:38 +01:00
Moriz Wahl
103790cccf
use jest.fn() for void function, correct timezone offset
2022-11-16 14:24:17 +01:00
Moriz Wahl
e4e308cdb4
fix seeds
2022-11-15 14:34:20 +01:00
Moriz Wahl
ef79580387
required argument client time zone offset for utils in creation
2022-11-15 14:20:33 +01:00
Moriz Wahl
d36fee0302
change order off arguements, implement changes for admin and contribution resolver
2022-11-15 14:10:18 +01:00
Wolfgang Huß
88b7e5ee78
Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates
...
# Conflicts:
# backend/package.json
# backend/yarn.lock
2022-11-14 13:55:46 +01:00
Wolfgang Huß
8589f352ad
Set backend 'i18n' language on login
2022-11-14 13:51:26 +01:00
Wolfgang Huß
c187b33a4d
Test 'sendEmailTranslated'
2022-11-14 09:36:43 +01:00
Wolfgang Huß
5b5aa2268b
Set current user language globaly
2022-11-11 12:09:41 +01:00
Moriz Wahl
e3d3f4bb94
liniting and improved names
2022-11-11 11:30:25 +01:00
Moriz Wahl
37e9482807
have timezoneOffset as optional parameter
2022-11-10 19:59:33 +01:00
Moriz Wahl
2b27e6aaa8
test for valid date string for creation date
2022-11-10 19:18:01 +01:00
Moriz Wahl
5e2d6c3bc9
fix: Timezone Problems on Change of Month
2022-11-10 19:01:16 +01:00
Wolfgang Huß
f8eea10371
Fix 'i18n' server integration for testing
...
- Fix the sending of the multiple times registrars name to the email owner.
- Clarify the logging of the multiple times registrars name and the email owners name.
2022-11-10 16:33:50 +01:00
Hannes Heine
e57e8120b7
Merge branch 'master' into 2272-send-email-for-rejected-contributions
2022-11-09 09:28:24 +01:00
Hannes Heine
7d26669f99
Update backend/src/graphql/resolver/AdminResolver.ts
...
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-11-09 09:28:07 +01:00
jjimenezgarcia
5606c80057
Merge branch 'master' into logger-error-cleaning-history
2022-11-08 13:25:16 +01:00
Hannes Heine
1a799f3020
Merge branch 'master' into 2272-send-email-for-rejected-contributions
2022-11-08 12:05:54 +01:00
elweyn
c79d186a45
Log error when contribution is in the wrong state. Write full content in changeMessage.
2022-11-07 10:32:26 +01:00
elweyn
c2fc4feb6a
Call method to send Email if contribution is rejected.
2022-11-07 10:11:14 +01:00
elweyn
b3fd53ab7a
Change the display of the history message.
2022-11-03 08:35:26 +01:00
jjimenezgarcia
d693f5f025
Merge branch 'master' into logger-error-cleaning-history
2022-11-02 15:22:30 +01:00
Hannes Heine
677519dda7
Merge branch 'master' into 2140-add-updated-at-to-contributions
2022-11-02 13:27:06 +01:00
Moriz Wahl
fdd3b0f4fd
fix: Release Statistic Query Runner
2022-11-01 14:30:43 +01:00
joseji
16699e19ad
small details
2022-10-31 14:46:52 +01:00
joseji
f69abcd04c
small tests modified
2022-10-28 11:46:18 +02:00
joseji
9846e095bf
logger now mocked propperly
2022-10-28 11:22:58 +02:00
Hannes Heine
a0bf498f40
Merge branch 'master' into 2140-add-updated-at-to-contributions
2022-10-28 09:57:33 +02:00
Moriz Wahl
c3b624f36f
add order by clause
2022-10-27 19:55:23 +02:00
Moriz Wahl
568a6cdd2c
Merge branch 'master' into 2202-refactor-creations-query
2022-10-27 15:01:40 +02:00
elweyn
69004d5659
Merge branch 'master' into 2140-add-updated-at-to-contributions
2022-10-26 12:05:49 +02:00
elweyn
0d304f9d71
Remove TODO comments and change the written message to only the old values no prefix.
2022-10-26 12:05:27 +02:00
joseji
1407ea0e8b
skipped test for changing month
2022-10-26 11:26:04 +02:00
Moriz Wahl
b2a1d7d672
include pending contributions for validation of contribution link, test it
2022-10-26 06:38:49 +02:00
Moriz Wahl
b5edc5f476
clean up
2022-10-25 13:45:43 +02:00
joseji
7662d281f7
fixed test with new info
2022-10-25 12:37:08 +02:00
Moriz Wahl
d1a1059158
Merge branch 'master' into 2202-refactor-creations-query
2022-10-25 12:15:51 +02:00
joseji
2bf1bd6d36
fixed collisions
2022-10-25 12:01:30 +02:00
joseji
f0c39703f1
fixed wrong removals of negative numbers
2022-10-24 22:05:17 +02:00
joseji
f8ef64054d
Merge branch 'master' into test-transaction-resolver
2022-10-24 22:02:18 +02:00
joseji
3bd339d798
fixed wrong removals of negative numbers
2022-10-24 22:01:19 +02:00
elweyn
53d315749d
Change import from ../enum to @enum
2022-10-24 16:01:48 +02:00
elweyn
68aa0a5d07
Withdrew createdAt = new Date() and use updatedAt or createdAt from the contribution.
2022-10-24 16:00:08 +02:00
elweyn
ce73e2c447
Change value from new to old value.
2022-10-24 13:40:28 +02:00
elweyn
94e9039c86
Add changed values to the new contribution message.
2022-10-24 13:23:42 +02:00