1931 Commits

Author SHA1 Message Date
Hannes Heine
013ea81614
Merge branch 'master' into 2878-trigger-export-klicktipp 2023-05-16 14:15:29 +02:00
clauspeterhuebner
251518dbf5
Merge branch 'master' into 2913-feature-mirgate-transactions-table-for-x-community-sendcoins 2023-05-11 22:54:41 +02:00
Moriz Wahl
d94543c1d9 fixes after merging suggestions 2023-05-10 20:47:28 +02:00
Moriz Wahl
1c92490019
Update backend/src/graphql/resolver/UserResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2023-05-10 18:39:52 +02:00
Moriz Wahl
dbe752563b
Update backend/src/graphql/resolver/util/validateAlias.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2023-05-10 18:39:41 +02:00
Moriz Wahl
c78691c87c ignore unsage regex lint 2023-05-10 18:00:29 +02:00
Moriz Wahl
e83c06a419
Merge branch 'master' into alias-update-user-info 2023-05-10 17:37:48 +02:00
Moriz Wahl
a82f0cb284 separate validation function for alias, tested 2023-05-10 17:37:01 +02:00
c8341f17fa
Merge branch 'master' into eslint-security 2023-05-10 13:30:57 +02:00
Hannes Heine
9abb08e852
Merge branch 'master' into 2878-trigger-export-klicktipp 2023-05-10 13:28:02 +02:00
Hannes Heine
67fe33997a
Merge branch 'master' into refactor-klicktipp-controller 2023-05-10 13:06:24 +02:00
elweyn
c41f9bccea Add mock for KlicktippController. 2023-05-10 12:51:34 +02:00
e01ef9ad10
ignore security warning where not applicable or unfixable for now 2023-05-10 12:15:12 +02:00
elweyn
1f90f9e63b Remove unused code. 2023-05-09 18:05:37 +02:00
Moriz Wahl
b7ce0e277c fix variable name 2023-05-09 13:58:53 +02:00
elweyn
ac1d87f88a Merge branch 'master' into refactor-klicktipp-controller 2023-05-09 12:35:37 +02:00
49976b30b7
fix problems 2023-05-09 12:20:28 +02:00
clauspeterhuebner
b88e5abdcf
Merge branch 'master' into 2913-feature-mirgate-transactions-table-for-x-community-sendcoins 2023-05-08 17:03:57 +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
elweyn
64d0200f99 Rename klicktippSignIn to subscribe. 2023-05-05 13:11:36 +02:00
elweyn
4a6a4376ec Merge master in here. 2023-05-05 11:26:31 +02:00
Claus-Peter Huebner
3434c6a34f Merge remote-tracking branch 'origin/master' into
2913-feature-mirgate-transactions-table-for-x-community-sendcoins
2023-05-04 20:39:53 +02:00
Hannes Heine
464cdcf7aa
Merge branch 'master' into 2882-feature-distingue-communities-and-communities_federation-in-database 2023-05-04 17:28:09 +02:00
Hannes Heine
ca8fd4c494
Merge branch 'master' into 2878-trigger-export-klicktipp 2023-05-04 14:58:56 +02:00
Hannes Heine
b4a497e158
Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-05-04 11:28:42 +02:00
Claus-Peter Huebner
b3a7781ffc Merge remote-tracking branch 'origin/master' into
2882-feature-distingue-communities-and-communities_federation-in-database
2023-05-04 00:40:03 +02:00
clauspeterhuebner
65aaba9d9e
Merge branch 'master' into 2913-feature-mirgate-transactions-table-for-x-community-sendcoins 2023-05-04 00:24:20 +02:00
elweyn
5d4d7dfa05 Merge master in here. 2023-05-03 14:09:04 +02:00
70cf72a4c1
Merge branch 'master' into eslint-disable-more-typesafety 2023-05-03 12:37:19 +02:00
239f42cfa4
Merge branch 'master' into eslint-disable-tests-typesafer 2023-05-03 11:24:56 +02:00
d27431728d
Merge branch 'master' into eslint-disable-@typescript-eslint/unbound-method 2023-05-03 11:01:29 +02:00
Claus-Peter Hübner
3fdeec0783 linting 2023-04-27 21:35:18 +02:00
Claus-Peter Hübner
7fb7ff9e8c rename communities to federated_communities 2023-04-20 02:28:29 +02:00
Moriz Wahl
8370b4f273 test user resolver returns no emails 2023-04-18 16:25:02 +02:00
Moriz Wahl
311bb50eb8 refactor(backend): no email in user 2023-04-18 16:14:44 +02:00
Claus-Peter Hübner
c62532c89a linting 2023-04-17 12:45:20 +02:00
Claus-Peter Hübner
ef6a39f5f5 Merge remote-tracking branch 'origin/master' into
2913-feature-mirgate-transactions-table-for-x-community-sendcoins
2023-04-13 19:17:10 +02:00
06fc7a729c
merge 2023-04-11 13:03:37 +02:00
9c461da0e7
fix emails 2023-04-11 13:01:58 +02:00
elweyn
7536898a0c Merge branch '2595-visualize-the-federation' into fix-community-url 2023-04-11 10:28:25 +02:00
elweyn
4cea48aeb8 Fix order of the communities 2023-04-11 09:44:21 +02:00
mahula
3e277bcb79 adapt community resolver unit tests to changes 2023-04-07 15:59:50 +02:00
Hannes Heine
1d547736a4
Merge branch 'master' into 2595-visualize-the-federation 2023-04-06 17:02:09 +02:00
Claus-Peter Hübner
c20e7f48fd Merge remote-tracking branch 'origin/master' into
2913-feature-mirgate-transactions-table-for-x-community-sendcoins
2023-04-06 16:02:43 +02:00
Claus-Peter Hübner
71f0f6c7f9 rework PR-comments 2023-04-06 15:59:59 +02:00
9464026a58
Merge branch 'master' into eslint-disable-@typescript-eslint/unbound-method 2023-04-06 15:32:33 +02:00
Hannes Heine
575d3a11a4
Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-04-06 15:14:20 +02:00
elweyn
d9e8247b3c Fix event no-cycle. 2023-04-06 15:12:08 +02:00