2718 Commits

Author SHA1 Message Date
elweyn
b8b6753677 Reviewed change requests. 2023-01-17 14:44:18 +01:00
elweyn
51abaf8a22 Last changes to make it work. 2023-01-13 13:20:00 +01:00
elweyn
7a7246cde5 Add error for already confirmed contribution. 2023-01-13 11:37:48 +01:00
elweyn
9d8c026617 Move contribution, user and moderator search in the first try block to lock the database. 2023-01-13 11:35:33 +01:00
elweyn
df4e2b419a Merge master in here. 2023-01-13 11:24:11 +01:00
elweyn
605812d777 Add error to confirmContribution mutation in case where contributionState is 'DENIED' 2023-01-13 11:15:14 +01:00
elweyn
79220ced79 Add deleted Contribution to the Contribution list in the admin interface. 2023-01-13 11:05:56 +01:00
mahula
18a2b7b6f9
Merge branch 'master' into open-creations-call 2023-01-13 10:13:32 +01:00
mahula
0c65d8c4ab
Merge branch 'master' into open-creations-call 2023-01-12 20:58:15 +01:00
5ceab09451
Merge branch 'master' into remove-jest-from-dependencies 2023-01-12 16:09:26 +01:00
elweyn
493aa32011 Deny contribution sends rejected contribution email. 2023-01-12 15:05:41 +01:00
Moriz Wahl
5a763f030a
Merge branch 'master' into open-creations-call 2023-01-12 13:41:21 +01:00
Wolfgang Huß
5efd1883d5
Merge branch 'master' into fix_admin_no_confirm 2023-01-12 13:06:47 +01:00
Moriz Wahl
d5cee42acc
Merge branch 'master' into update-browser-list-2 2023-01-12 12:15:55 +01:00
b2f9c499dd
use try finally to release lock 2023-01-11 22:47:55 +01:00
Moriz Wahl
3a63e2721d remove creations from graphql user object 2023-01-11 22:32:50 +01:00
Moriz Wahl
8f9e77a9c1 add test: confirming a confirmed contribution throws 2023-01-11 21:40:11 +01:00
Moriz Wahl
29479bafec release lock after each error 2023-01-11 21:29:11 +01:00
Moriz Wahl
6389697bd6 reset unit tests 2023-01-11 21:13:38 +01:00
340554b815
skipped alot of test due to unknown timeout errors 2023-01-11 15:39:33 +01:00
Moriz Wahl
dc33427cd0 add openCreation graphqlModel and resolver 2023-01-11 15:15:26 +01:00
805706a417
Merge branch 'master' into 1257-feature-fake-email-server 2023-01-11 14:38:34 +01:00
Moriz Wahl
23ce6f62c1 fix(other): update browser list 2023-01-11 13:26:29 +01:00
8628a05a21
properly use findOne where 2023-01-11 13:14:50 +01:00
c9488c8b81
try to minimize changeset 2023-01-11 13:11:40 +01:00
c585b2c234
check for confirmed transaction within semaphore lock 2023-01-11 13:08:47 +01:00
c0b3a93a59
calculate last transaction correctly 2023-01-11 12:35:22 +01:00
elweyn
ea30fed068 Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-10 16:07:24 +01:00
Hannes Heine
447d252e58
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-10 14:41:10 +01:00
elweyn
95e1cd4b6d Merge branch 'master' into add_hide_amount_to_users 2023-01-10 14:00:47 +01:00
0444567579
Merge branch 'master' into remove-jest-from-dependencies 2023-01-10 13:21:49 +01:00
mahula
3406aa115d
Merge branch 'master' into 1257-feature-fake-email-server 2023-01-10 11:16:15 +01:00
mahula
1e265b1078 set email username and password to empty string in backend config 2023-01-10 11:07:16 +01:00
elweyn
d71a73ec3b Add new mutation variables to the tests mutation in backend. 2023-01-10 10:56:08 +01:00
elweyn
427a0a6865 Change test of returned login datas. 2023-01-10 10:55:41 +01:00
754140dcbc
removed jest from dependencies - only present in dev dependencies now 2023-01-10 10:54:57 +01:00
ogerly
ae5c5984b8 change hide amounts to optional 2023-01-10 10:06:58 +01:00
Alexander Friedland
11c2b3900c
Merge branch 'master' into add_hide_amount_to_users 2023-01-10 09:10:50 +01:00
Moriz Wahl
712c62e6da
Merge branch 'master' into seed-contributions 2023-01-09 21:01:45 +01:00
9a9de722c8
Merge branch 'master' into fix_logger_middleware 2023-01-09 19:57:50 +01:00
1d3ecd3339
Merge branch 'master' into 2522-correct-email-text 2023-01-09 19:38:31 +01:00
Moriz Wahl
e009fcb87d
Merge branch 'master' into seed-contributions 2023-01-09 14:49:21 +01:00
9bbb401428
fixed email text 2023-01-08 13:53:16 +01:00
5f58ec9393
Merge branch 'master' into fix-config 2023-01-06 13:23:27 +01:00
Hannes Heine
85744a100e
Merge branch 'master' into add_hide_amount_to_users 2023-01-05 14:07:17 +01:00
195da143ba
Merge branch 'master' into fix_logger_middleware 2023-01-03 13:11:25 +01:00
b36c9a41dc
Merge branch 'master' into 2502-adjust-some-texts-and-translations 2023-01-03 13:07:48 +01:00
f83b9a762c
also fix backend month test 2023-01-03 12:41:42 +01:00
elweyn
2010a1b059 Add hideAmountGDD and hideAmountGDT to the login mutations and the verifyLogin queries 2023-01-03 12:24:49 +01:00
elweyn
e936e2bf40 Add new fields hideAmount... to the communityUser. 2023-01-03 11:28:20 +01:00