199 Commits

Author SHA1 Message Date
Moriz Wahl
e83c06a419
Merge branch 'master' into alias-update-user-info 2023-05-10 17:37:48 +02:00
2545f1342e
fix security issue 2023-05-10 12:14:13 +02:00
49976b30b7
fix problems 2023-05-09 12:20:28 +02:00
Moriz Wahl
3b7f565b02
Merge branch 'master' into alias-update-user-info 2023-05-08 14:33:42 +02:00
Moriz Wahl
ad4418d297 test transaction list query to raise coverage 2023-05-08 09:35:14 +02:00
Moriz Wahl
c42ee8d264
Merge branch 'master' into no-email-in-user 2023-05-08 08:55:18 +02:00
Hannes Heine
b4a497e158
Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-05-04 11:28:42 +02:00
70cf72a4c1
Merge branch 'master' into eslint-disable-more-typesafety 2023-05-03 12:37:19 +02:00
Moriz Wahl
8370b4f273 test user resolver returns no emails 2023-04-18 16:25:02 +02:00
Hannes Heine
575d3a11a4
Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-04-06 15:14:20 +02:00
elweyn
c3a47460da Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-04-06 15:02:08 +02:00
657c171898
merge 2023-04-06 14:05:50 +02:00
56dbcd4f58
various more typesafety 2023-04-05 05:46:38 +02:00
7a44a223e9
lint fixes 2023-03-31 12:51:51 +02:00
ae8405e8f6
merge 2023-03-31 12:48:09 +02:00
elweyn
0345e8420d Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-03-31 07:27:58 +02:00
Moriz Wahl
976940047e Merge branch 'master' into feat-send-coins-via-gradido-ID 2023-03-30 19:14:09 +02:00
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
elweyn
c07582d5a1 Merge & linting 2023-03-30 16:44:17 +02:00
Moriz Wahl
43e2f5fbc8 do not allow user to edit admin contributions 2023-03-30 16:40:07 +02:00
Hannes Heine
b67baf665b
Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-03-30 16:37:03 +02:00
elweyn
ff7a73048c Correct mutations in testing 2023-03-30 16:29:35 +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
Moriz Wahl
9c84ca185d Merge branch 'master' into feat-send-coins-via-gradido-ID 2023-03-23 13:15:47 +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
761ff80b97 use findUserByIdentifier for emails, use it in send coins 2023-03-14 21:14:41 +01:00
Moriz Wahl
8db5c055e5 simple user query and test 2023-03-14 13:08:51 +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