175 Commits

Author SHA1 Message Date
Moriz Wahl
d3ac556885 Merge branch 'master' into 2803-open-contribution-edit-button 2023-03-30 18:26:02 +02:00
Moriz Wahl
6dff07a7ba Revert "do not allow user to edit admin contributions"
This reverts commit 43e2f5fbc839921b5b0fe3deadc85c15baeb104f.
2023-03-30 18:25:47 +02:00
7d7eb34aeb
fix order 2023-03-30 18:04:43 +02:00
9407386de7
fix alphabetical sort 2023-03-30 17:57:15 +02:00
80ff97e72a
more lint fixes 2023-03-30 17:39:09 +02:00
b0c19eda47
fix import order 2023-03-30 17:28:03 +02:00
Moriz Wahl
43e2f5fbc8 do not allow user to edit admin contributions 2023-03-30 16:40:07 +02:00
Moriz Wahl
10022c2247 Merge branch 'master' into 2803-open-contribution-edit-button 2023-03-30 15:11:18 +02:00
c874fb6ca1
Merge branch 'master' into eslint-plugin-import-fixes 2023-03-28 01:08:16 +02:00
Moriz Wahl
2ac94e1b47 Merge branch 'master' into 2803-open-contribution-edit-button 2023-03-23 13:17:02 +01:00
Hannes Heine
e4159399fb
Merge branch 'master' into refactor-find-contribtiions 2023-03-23 10:04:16 +01:00
Moriz Wahl
8f56be790b Merge branch 'master' into 2803-open-contribution-edit-button 2023-03-21 14:44:13 +01:00
Claus-Peter Hübner
e1c239cd08 rework PR-comments 2023-03-15 01:25:34 +01:00
Moriz Wahl
4bcc0e19e8
Merge branch 'master' into refactor-find-contribtiions 2023-03-14 11:31:27 +01:00
5d1311229f
more rules 2023-03-12 02:19:10 +01:00
c54e6fb8ae
new rules + fixes 2023-03-12 02:19:10 +01:00
721ccecd12
fixes 2023-03-12 02:19:10 +01:00
Moriz Wahl
84a6eccd49
Merge branch 'master' into test-transaction-links 2023-03-10 15:36:04 +01:00
Moriz Wahl
f8cc681e06 fix unit tests 2023-03-10 15:26:07 +01:00
Moriz Wahl
d4d38e29b6 Merge branch 'master' into refactor-find-contribtiions 2023-03-10 14:42:43 +01:00
827c829306
fixes based on the unit tests 2023-03-09 14:37:25 +01:00
3391b3a9ee
merge 2023-03-09 14:37:17 +01:00
Moriz Wahl
ecd9efac4f add optional arg user id to admin list contributions query 2023-03-07 17:47:11 +01:00
Moriz Wahl
e48bbd7b47 rename admin list all contributions query 2023-03-07 17:33:18 +01:00
Moriz Wahl
a49251205f test double redeem of transaction link 2023-03-07 16:24:17 +01:00
Moriz Wahl
e4a9533802 refactor(backend): use find contributions helper in list contributions 2023-02-28 20:36:23 +01:00
21b6e35391
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-27 15:53:59 +01:00
dec47d6dc5
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-23 22:07:08 +01:00
Moriz Wahl
6e88068a88 Merge branch 'master' into remove-adminCreateContributions 2023-02-21 15:20:45 +01:00
Moriz Wahl
23abbfa658 remove adminCreateContributions mutation 2023-02-20 14:59:57 +01:00
9de2149c8f
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-17 14:10:51 +01:00
elweyn
b1b3a060cb Merge master in refactor adminListContributions. 2023-02-17 11:20:43 +01:00
elweyn
34fe6b4e90 Rework reviews, add the properties used in the ui for listContributions. 2023-02-15 09:44:00 +01:00
Hannes Heine
38b7234d96
Merge branch 'master' into refactor-deny-contribution-unit-test 2023-02-15 09:23:08 +01:00
66a5175dc1
combine logic for both listTransactionLinks and listTransactionLinksAdmin 2023-02-14 21:28:58 +01:00
a88585086c
test sendActivationEmail 2023-02-13 13:12:58 +01:00
elweyn
bcf63ec334 Deconstruct test for listContributions. 2023-02-09 15:02:53 +01:00
elweyn
ad16aff1ea Change listUnconfirmedContributions to adminListAllContributions. 2023-02-06 15:06:58 +01:00
elweyn
8c00fcd6cc Merge new unit tests for ContributionResolver. 2023-02-06 14:34:40 +01:00
Hannes Heine
d40114df69
Merge branch 'master' into refactor-deny-contribution-unit-test 2023-02-02 15:19:56 +01:00
elweyn
08d8c008f6 Add denyContribution mutation to the seeds. 2023-01-31 13:07:41 +01:00
elweyn
75d47d016d Remove the default null of statusFilter or the test query. 2023-01-31 11:19:43 +01:00
elweyn
0bd3ce27df Change Tests to statusFilter. 2023-01-25 16:48:49 +01:00
elweyn
cc0fe5968d Tests that the filterState parameter in listAllContributions works as expected. 2023-01-25 07:54:17 +01:00
elweyn
2cecadded2 Add filterState to the backend test listAllContributions query. 2023-01-24 17:02:08 +01:00
elweyn
95e1cd4b6d Merge branch 'master' into add_hide_amount_to_users 2023-01-10 14:00:47 +01:00
elweyn
d71a73ec3b Add new mutation variables to the tests mutation in backend. 2023-01-10 10:56:08 +01:00
Moriz Wahl
e009fcb87d
Merge branch 'master' into seed-contributions 2023-01-09 14:49:21 +01:00
Moriz Wahl
c4214eb2c6 remove timeouts in seeds 2022-12-22 14:10:34 +01:00
Moriz Wahl
06b5fa4295 refactor(backend): seed contributions as user 2022-12-12 14:05:15 +01:00