13718 Commits

Author SHA1 Message Date
elweyn
71266dcc2d Fix linting rules 2023-03-31 07:16:21 +02:00
elweyn
989a3e30f2 Import order fixed by lint 2023-03-31 07:16:04 +02:00
elweyn
c07582d5a1 Merge & linting 2023-03-30 16:44:17 +02:00
Hannes Heine
b67baf665b
Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-03-30 16:37:03 +02:00
elweyn
8c3a847af6 Linting 2023-03-30 16:31:02 +02:00
elweyn
54e912f028 Add unit tests for KlicktippResolver 2023-03-30 16:30:44 +02:00
elweyn
e1c6764978 Remove unused queries 2023-03-30 16:30:11 +02:00
elweyn
ff7a73048c Correct mutations in testing 2023-03-30 16:29:35 +02:00
elweyn
04c6756ef4 Remove check on CONFIG.KLICKTIPP 2023-03-30 16:29:05 +02:00
elweyn
ada9f9a056 Remove not used function rights. 2023-03-30 16:28:38 +02:00
elweyn
b2f0bf37d2 Refactor klicktippcontroller to not call function 2023-03-30 16:28:18 +02:00
002dfe5a73
Merge pull request #2827 from gradido/eslint-plugin-import-fixes
refactor(backend): eslint plugin import + fixes
2023-03-30 14:20:32 +02:00
5b451520d0
Merge branch 'master' into eslint-plugin-import-fixes 2023-03-30 14:06:21 +02:00
fee1a49295
Merge pull request #2900 from gradido/event-tests-for-transactionLinks
refactor(backend): missing event tests
2023-03-30 10:13:54 +02:00
90c9802ece
disable import/no-cycle 2023-03-29 15:10:30 +02:00
6a8e239ab0
merge 2023-03-29 15:06:26 +02:00
e6aa6a5c98
Merge branch 'master' into event-tests-for-transactionLinks 2023-03-29 11:18:11 +02:00
afd5703c80
missing event tests 2023-03-29 11:06:47 +02:00
1b45941081
Merge pull request #2799 from gradido/events-unify-names
refactor(backend): unify event names
2023-03-29 10:56:53 +02:00
Hannes Heine
8be1278770
Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-03-29 10:00:14 +02:00
e08c156acf
merge conflict solved 2023-03-29 09:47:51 +02:00
1f0b07b708
Merge branch 'master' into events-unify-names 2023-03-29 09:47:40 +02:00
5542989063
Merge pull request #2797 from gradido/events-user
feat(backend): events for users
2023-03-29 09:44:02 +02:00
Hannes Heine
cecfc346cc
Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-03-29 07:54:19 +02:00
3ae1ad7953
Merge branch 'master' into events-user 2023-03-28 12:02:10 +02:00
Hannes Heine
184de4672e
Merge pull request #2885 from gradido/2785-remove-email-from-subscribe-unsubscribe
fix(backend): subscription get's email and languages from user
2023-03-28 02:14:10 +02:00
d0d9be2d28
Merge branch 'master' into events-user 2023-03-28 01:54:34 +02:00
Hannes Heine
3c9dca5b46
Update backend/src/graphql/resolver/KlicktippResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2023-03-28 01:49:27 +02:00
Hannes Heine
d6536f275f
Update backend/src/graphql/resolver/KlicktippResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2023-03-28 01:49:08 +02:00
69a29f0a31
fix linting 2023-03-28 01:36:52 +02:00
00a2ba2387
lint fixes 2023-03-28 01:08:30 +02:00
c874fb6ca1
Merge branch 'master' into eslint-plugin-import-fixes 2023-03-28 01:08:16 +02:00
Hannes Heine
8a4aa5630b
Merge branch 'master' into 2785-remove-email-from-subscribe-unsubscribe 2023-03-28 00:56:55 +02:00
2cf2a75df5
Merge pull request #2816 from gradido/eslint-plugin-jest-fixes
refactor(backend): eslint-plugin-jest + fixes
2023-03-28 00:51:27 +02:00
eefdf5ae58
Merge branch 'master' into eslint-plugin-jest-fixes 2023-03-28 00:39:18 +02:00
Hannes Heine
07164e5c34
Merge pull request #2888 from gradido/fix-french-apostroph
fix(frontend): fr change ` and ´ to '
2023-03-28 00:35:27 +02:00
f6071d6e07
fix linting 2023-03-28 00:25:14 +02:00
caa0e5fe0f
Merge branch 'master' into events-user 2023-03-28 00:23:39 +02:00
Hannes Heine
b475b17e0b
Merge branch 'master' into fix-french-apostroph 2023-03-28 00:21:54 +02:00
6e96f9ee7c
Merge pull request #2792 from gradido/events-transaction-link
feat(backend): events for transaction links
2023-03-28 00:20:55 +02:00
4c4da6e929
fixed linting 2023-03-27 23:59:46 +02:00
elweyn
06a5cd678b Fix test 2023-03-24 13:36:25 +01:00
elweyn
5a960a6e27 Frontend mutation call remove language 2023-03-24 13:36:18 +01:00
elweyn
68064a9797 remove language from mutation definition 2023-03-24 13:35:43 +01:00
elweyn
1f13613049 remove language from mutation 2023-03-24 13:35:03 +01:00
Hannes Heine
2954c61892
Merge branch 'master' into 2785-remove-email-from-subscribe-unsubscribe 2023-03-24 12:41:16 +01:00
elweyn
a3e135969d fix(frontend): FR change ```` and ´ to '` 2023-03-24 12:08:47 +01:00
980242012f
Merge branch 'master' into events-transaction-link 2023-03-24 12:02:39 +01:00
d0564c231b
Merge pull request #2784 from gradido/events-contribution
feat(backend): events for contributions
2023-03-24 12:02:12 +01:00
b23030e612
Merge branch 'master' into events-contribution 2023-03-24 11:50:15 +01:00