3475 Commits

Author SHA1 Message Date
clauspeterhuebner
36453d4a17
Merge branch 'master' into 2882-feature-distingue-communities-and-communities_federation-in-database 2023-04-22 19:53:56 +02:00
d04e928480
Merge branch 'master' into eslint-plugin-promise 2023-04-21 19:45:26 +02:00
9ef51bf0ba
Merge branch 'master' into fix-log-stack-trace 2023-04-21 09:58:07 +02:00
a1aa4fad63
stacktrace only for errorfile 2023-04-21 09:57:50 +02:00
4b07f44326
Merge branch 'master' into prettier-refine-config 2023-04-21 09:50:53 +02:00
32f467ba85
Merge branch 'master' into eslint-plugin-promise 2023-04-21 09:48:15 +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
2892a1f627
v1.20.0 2023-04-12 12:29:50 +02:00
mahula
fe1abcdc9a
Merge branch 'master' into 2473-feature-emails-further-design-of-html-emails 2023-04-12 08:58:23 +02:00
b156d6a0b7
Merge branch 'master' into fix-log-stack-trace 2023-04-11 23:21:24 +02:00
67a5458a97
fix tests 2023-04-11 13:12:51 +02:00
06fc7a729c
merge 2023-04-11 13:03:37 +02:00
9c461da0e7
fix emails 2023-04-11 13:01:58 +02:00
3eb95e19b9
emails are async again 2023-04-11 12:53:59 +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
elweyn
0bb00a3af4 fix(federation): correct exported of community url.' 2023-04-06 23:35:30 +02:00
Hannes Heine
1d547736a4
Merge branch 'master' into 2595-visualize-the-federation 2023-04-06 17:02:09 +02:00
693338975e
fix problems with compile 2023-04-06 15:37:34 +02:00
9464026a58
Merge branch 'master' into eslint-disable-@typescript-eslint/unbound-method 2023-04-06 15:32:33 +02:00
7998de2808
Merge branch 'master' into eslint-plugin-promise 2023-04-06 15:30:35 +02:00
4ca989a3da
stack traces only for errors 2023-04-06 15:21:02 +02:00
8475d91494
Merge branch 'master' into fix-log-stack-trace 2023-04-06 15:17:37 +02:00
Hannes Heine
575d3a11a4
Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-04-06 15:14:20 +02:00
163262dd85
Merge branch 'master' into prettier-refine-config 2023-04-06 15:14:20 +02:00
d89fca8d1d
restructure axios calls to use await 2023-04-06 15:12:49 +02:00
elweyn
d9e8247b3c Fix event no-cycle. 2023-04-06 15:12:08 +02:00
aa8b9d017d
return value on then 2023-04-06 15:11:33 +02:00
elweyn
c3a47460da Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-04-06 15:02:08 +02:00
Hannes Heine
525a560832
Update backend/src/event/Event.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2023-04-06 14:53:51 +02:00
Hannes Heine
7d12ecbe98
Update backend/src/graphql/resolver/KlicktippResolver.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2023-04-06 14:53:35 +02:00
Hannes Heine
f36bc61a70
Update backend/src/graphql/resolver/KlicktippResolver.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2023-04-06 14:53:24 +02:00
Hannes Heine
3990135c7a
Update backend/src/graphql/resolver/KlicktippResolver.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2023-04-06 14:53:09 +02:00
Hannes Heine
50574ece6b
Update backend/src/graphql/resolver/KlicktippResolver.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2023-04-06 14:52:58 +02:00
f2168ccea7
Merge branch 'master' into eslint-plugin-promise 2023-04-06 14:25:35 +02:00
27a89a2734
removed obsolete comment 2023-04-06 14:21:26 +02:00
e4fc4438fb
removed obsolete comment 2023-04-06 14:20:41 +02:00
f2ad6cc24a
fix merge problem 2023-04-06 14:10:46 +02:00
657c171898
merge 2023-04-06 14:05:50 +02:00
8d8900c463
fix eslint.rc 2023-04-06 13:39:04 +02:00
mahula
a04d2a686a add separate footer template for emails 2023-04-06 13:06:01 +02:00
1a0edb08c5
Merge branch 'master' into vscode-intellisense-fixes 2023-04-06 12:35:34 +02:00
mahula
59a66d7be4 remove greating and imprint email template 2023-04-06 10:29:37 +02:00
e438502d46
Merge branch 'master' into import-no-cycle-refactor-events 2023-04-05 19:02:12 +02:00
Moriz Wahl
6065cfee33 remove unused file 2023-04-05 13:25:12 +02:00
Moriz Wahl
bb887be74c refactor(backend): get transaction list 2023-04-05 13:22:21 +02:00
Moriz Wahl
248737c446
Merge branch 'master' into feat-previous-balance 2023-04-05 12:16:18 +02:00