2737 Commits

Author SHA1 Message Date
elweyn
57222d07c4 Change rejected to deny, add error test for denyContribution & remove TODO comment. 2023-01-24 15:56:58 +01:00
elweyn
4f85b8508d Fix locales. 2023-01-24 15:38:28 +01:00
elweyn
da652e6745 Rename reject to deny and rejected to denied. 2023-01-24 15:22:37 +01:00
Hannes Heine
23e3e02139
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-24 08:39:15 +01:00
62e76e02ad
v1.17.1 2023-01-19 22:11:20 +01:00
Hannes Heine
c84fa68132
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-19 07:50:22 +01:00
a3dc4c168b
v1.17.0 2023-01-18 15:54:57 +01:00
Moriz Wahl
52f9da5c0d fix(backend): admin cannot delete confirmed contribution 2023-01-18 15:06:18 +01:00
Moriz Wahl
d3a78e4369
Merge branch 'master' into statistics-with-field-resolvers 2023-01-17 16:52:59 +01:00
elweyn
b8b6753677 Reviewed change requests. 2023-01-17 14:44:18 +01:00
cd203ab2c2
removed if possible comment 2023-01-17 12:31:55 +01:00
a3a69bc012
removed comment 2023-01-17 12:29:28 +01:00
82fd6a9c5b
implement moriz requirements for test 2023-01-17 12:24:41 +01:00
Moriz Wahl
b66372bd90 change name of dynamic statitics fields 2023-01-16 19:42:01 +01:00
3bf69814ca
test error cases for semaphore 2023-01-16 16:47:33 +01:00
Moriz Wahl
7781011b1a refactor(backend): field resolvers in statistics 2023-01-16 15:22:45 +01:00
466e59a550
typo 2023-01-16 11:27:30 +01:00
c3f7f15420
refactor all semaphore-locks 2023-01-16 11:21:38 +01:00
fd2563f171
Merge branch 'master' into fix-semaphore-deadlock-on-error 2023-01-16 11:16:45 +01:00
dab7fe584a
try catch around semaphore lock 2023-01-16 11:04:14 +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