14232 Commits

Author SHA1 Message Date
Hannes Heine
4968adaadd
Merge branch 'master' into refactor-klicktipp-controller 2023-05-05 13:14:51 +02:00
elweyn
64d0200f99 Rename klicktippSignIn to subscribe. 2023-05-05 13:11:36 +02:00
ee6c2f2231
Merge pull request #2969 from gradido/federation-docker-nodemon
feat(federation): federation autoreload on codechange
2023-05-05 13:11:28 +02:00
569b887f14
Merge branch 'master' into fix-store-problems 2023-05-05 12:58:56 +02:00
2cc45d23f7
fix between store problems 2023-05-05 12:44:42 +02:00
Hannes Heine
76c627b177
Merge branch 'master' into federation-docker-nodemon 2023-05-05 12:37:23 +02:00
Hannes Heine
b9c0d4201b
Merge pull request #2887 from gradido/2876-add-fields-to-subscriber
feat(backend): add fields to subscriber
2023-05-05 12:03:06 +02:00
Hannes Heine
f13cb3f26d
Merge branch 'master' into 2876-add-fields-to-subscriber 2023-05-05 11:44:15 +02:00
2bf839f362
lint fixes 2023-05-04 22:54:38 +02:00
d3ba23e1e4
fix lint 2023-05-04 22:54:38 +02:00
97b3a88065
86% line coverage 2023-05-04 22:54:38 +02:00
6c7243758f
fix tests 2023-05-04 22:54:38 +02:00
cd7cef4fbf
typo 2023-05-04 22:54:38 +02:00
2abf228ca9
merge 2023-05-04 22:53:55 +02:00
2d03ae938a
merge conflict 2023-05-04 22:50:06 +02:00
c8ef6be2cd
Merge branch 'master' into refactor_federation_clients 2023-05-04 22:50:01 +02:00
14a2766256
Merge branch 'master' into federation-docker-nodemon 2023-05-04 22:42:29 +02:00
Claus-Peter Huebner
6a63e5956d adaptions after master-merge 2023-05-04 20:48:43 +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
2df8a758fa
Merge pull request #2890 from gradido/2882-feature-distingue-communities-and-communities_federation-in-database
feat(backend): x-com-2: distingue communities and communities_federation in database
2023-05-04 18:01:30 +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
59cb0ce4b9
use yarn dev for federation to autoreload on codechange 2023-05-04 14:59:38 +02:00
Hannes Heine
4c452e3529
Merge branch 'master' into 2876-add-fields-to-subscriber 2023-05-04 14:31:44 +02:00
Hannes Heine
3ed65fee51
Merge pull request #2886 from gradido/2785-add-events-for-subscribe-unsubscribe
feat(backend): add event for subscribe and unsubscribe
2023-05-04 12:02:48 +02:00
0a6c29bca3
variables must be transmitted due to backward compatibility 2023-05-04 11:28:53 +02:00
Hannes Heine
b4a497e158
Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-05-04 11:28:42 +02:00
950ff2f9b6
lint 2023-05-04 02:01:45 +02:00
d636f92261
fix problem in federation when variables are not defined 2023-05-04 01:57:43 +02:00
1fa3396396
externalize the graphql query 2023-05-04 01:55:14 +02:00
81552e51dd
properly reuse graphql client 2023-05-04 01:51:36 +02:00
1c6142220f
rename getPublicKey function 2023-05-04 01:40:50 +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
4850923f17
variables must be defined 2023-05-03 13:29:56 +02:00
f3af9aaec1
Merge pull request #2922 from gradido/eslint-disable-more-typesafety
refactor(backend): eslint disable more typesafety
2023-05-03 13:29:54 +02:00
8c76de3ee5
try fixing auth tests by reverting header token change 2023-05-03 13:07:54 +02:00
d3a2df2878
remove obsolete function 2023-05-03 13:03:27 +02:00
870c97ce71
rfactor federation clients 2023-05-03 13:02:32 +02:00
9b9c0ea8cb
merge conflict 2023-05-03 12:37:29 +02:00
70cf72a4c1
Merge branch 'master' into eslint-disable-more-typesafety 2023-05-03 12:37:19 +02:00
cb3b800d5c
Merge pull request #2921 from gradido/eslint-disable-tests-typesafer
refactor(backend): eslint disable tests typesafer
2023-05-03 12:23:54 +02:00
239f42cfa4
Merge branch 'master' into eslint-disable-tests-typesafer 2023-05-03 11:24:56 +02:00
3245f913e5
Merge pull request #2920 from gradido/eslint-disable-@typescript-eslint/unbound-method
refactor(backend): eslint disable @typescript eslint/unbound method
2023-05-03 11:22:29 +02:00
ba42ed9778
Merge branch 'master' into eslint-disable-@typescript-eslint/unbound-method 2023-05-03 11:06:19 +02:00
a107886c0a
Merge pull request #2909 from gradido/docu-cron-yarn
docs(other): removed obsolete yarn cron docu
2023-05-03 11:05:57 +02:00
d27431728d
Merge branch 'master' into eslint-disable-@typescript-eslint/unbound-method 2023-05-03 11:01:29 +02:00
fe253d09f8
Merge branch 'master' into docu-cron-yarn 2023-05-03 10:18:51 +02:00
bf3cbfa875
typo 2023-05-03 10:19:01 +02:00
7cb11af599
fix typo 2023-05-03 10:17:25 +02:00
1241f00ede
fixed typos 2023-05-03 10:16:37 +02:00