13053 Commits

Author SHA1 Message Date
clauspeterhuebner
c40e112f6f
Merge branch 'master' into 2632-feature-dockerfile-for-federation 2023-02-16 13:48:35 +01:00
clauspeterhuebner
3b41ec27b6
Merge pull request #2511 from gradido/2501-feature-federation-implement-a-graphql-client-to-request-getpublickey
feat(federation): implement a graphql client to request getpublickey
2023-02-16 13:48:03 +01:00
Alexander Friedland
1cf217b1f0
Merge branch 'master' into 2594-contributions-list-frontend 2023-02-15 14:55:28 +01:00
Alexander Friedland
ebbb86d054
Update admin/src/locales/en.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2023-02-15 14:54:45 +01:00
Alexander Friedland
fdee876ffb
Update admin/src/pages/Overview.spec.js
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2023-02-15 14:52:34 +01:00
Alexander Friedland
ead181eec7
Update admin/src/pages/CreationConfirm.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2023-02-15 14:52:21 +01:00
Alexander Friedland
580f57f99d
Update admin/src/pages/Overview.spec.js
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2023-02-15 14:51:37 +01:00
elweyn
b9c46d2238 Correct spelling error. 2023-02-15 12:33:13 +01:00
elweyn
00a45d7805 Corrected the expected amount from the ADMIN_CONTRIBUTION_DELETE event. 2023-02-15 12:17:17 +01:00
elweyn
11f19262b0 Add expected data to Protocols tests. 2023-02-15 11:40:02 +01:00
elweyn
d32b520145 Change test description to better naming. 2023-02-15 10:00:30 +01:00
elweyn
34fe6b4e90 Rework reviews, add the properties used in the ui for listContributions. 2023-02-15 09:44:00 +01:00
Hannes Heine
38b7234d96
Merge branch 'master' into refactor-deny-contribution-unit-test 2023-02-15 09:23:08 +01:00
clauspeterhuebner
97334c6daa
Merge branch 'master' into 2650-feature-federation-harmonize-and-sync-modules-of-federation 2023-02-15 00:02:56 +01:00
clauspeterhuebner
1758c6f1c0
Merge branch 'master' into 2632-feature-dockerfile-for-federation 2023-02-15 00:02:42 +01:00
clauspeterhuebner
a8176a3b4a
Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey 2023-02-15 00:02:25 +01:00
Alexander Friedland
b3b84fca36
Merge pull request #2643 from gradido/2598-Register-Login-buttons-not-full-size
refactor(frontend): style refactor mobil auth area
2023-02-15 00:01:57 +01:00
Claus-Peter Hübner
491dd12ae0 reduce coverage 2023-02-14 22:12:58 +01:00
Claus-Peter Hübner
ef2f8da826 linting 2023-02-14 22:00:12 +01:00
Claus-Peter Hübner
1c1356508f Merge branch '2632-feature-dockerfile-for-federation' of github.com:gradido/gradido into 2632-feature-dockerfile-for-federation 2023-02-14 21:51:30 +01:00
Claus-Peter Hübner
cf24708757 rework PR-comments 2023-02-14 21:51:02 +01:00
clauspeterhuebner
9b3449ff93
Update .github/workflows/test_federation.yml
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2023-02-14 21:49:35 +01:00
Alexander Friedland
a7b6e3c384
Merge branch 'master' into 2598-Register-Login-buttons-not-full-size 2023-02-14 21:39:13 +01:00
Claus-Peter Hübner
1c3ef54341 Merge remote-tracking branch 'origin/master' into 2632-feature-dockerfile-for-federation 2023-02-14 21:34:41 +01:00
ae940b509a
removed unused imports 2023-02-14 21:33:24 +01:00
5bba531769
missing graphql changes 2023-02-14 21:29:14 +01:00
66a5175dc1
combine logic for both listTransactionLinks and listTransactionLinksAdmin 2023-02-14 21:28:58 +01:00
clauspeterhuebner
270a73689d
Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey 2023-02-14 21:24:03 +01:00
clauspeterhuebner
14ec20d172
Update dht-node/.env.template
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-14 21:23:41 +01:00
clauspeterhuebner
7db91092db
Merge branch 'master' into 2650-feature-federation-harmonize-and-sync-modules-of-federation 2023-02-14 21:22:23 +01:00
9ff045fdbf
test for authentication on TransactionLinkResolver 2023-02-14 20:31:56 +01:00
ea42ac6a40
Merge branch 'master' into logger_creations 2023-02-14 20:14:16 +01:00
0d5370948f
Merge pull request #2676 from gradido/logger_transactionResolver
refactor(backend): use LogError on TransactionResolver
2023-02-14 20:12:10 +01:00
mahula
7992074e88
remove cucumber messages file from e2e module 2023-02-14 18:08:52 +01:00
Moriz Wahl
7c2bf9da7a
Merge branch 'master' into 2594-contributions-list-frontend 2023-02-14 17:59:34 +01:00
clauspeterhuebner
7076cb3095
Merge branch 'master' into 2650-feature-federation-harmonize-and-sync-modules-of-federation 2023-02-14 17:42:11 +01:00
clauspeterhuebner
92543a420d
Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey 2023-02-14 17:36:28 +01:00
Moriz Wahl
0b60759c69 remove warnings from test 2023-02-14 17:26:21 +01:00
Moriz Wahl
3e894d36bd fix linting, raise coverage 2023-02-14 17:17:17 +01:00
4864ad6276
Merge branch 'master' into logger_transactionResolver 2023-02-14 17:11:48 +01:00
db236b1d34
Merge pull request #2691 from gradido/event_protocol_rework
refactor(backend): event protocol rework
2023-02-14 17:11:34 +01:00
clauspeterhuebner
cf0f4cd241
Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey 2023-02-14 17:11:24 +01:00
clauspeterhuebner
18636c8018
Merge branch 'master' into 2650-feature-federation-harmonize-and-sync-modules-of-federation 2023-02-14 17:11:09 +01:00
Moriz Wahl
f8fca7ab0c move deny contribution to left 2023-02-14 17:08:12 +01:00
Moriz Wahl
ddbdbe4224 Merge branch 'master' into 2594-contributions-list-frontend 2023-02-14 17:05:11 +01:00
70c6d3b026
Merge branch 'master' into event_protocol_rework 2023-02-14 16:20:36 +01:00
18242ccfea
Merge branch 'master' into logger_transactionResolver 2023-02-14 16:18:29 +01:00
5f41286d56
Merge pull request #2673 from gradido/logger_transactionLinkResolver
refactor(backend): use LogError on TransactionLinkResolver
2023-02-14 16:18:10 +01:00
ef1c436132
Merge branch 'master' into logger_transactionLinkResolver 2023-02-14 16:05:41 +01:00
Moriz Wahl
5713e703b3 improve unit tests contribution link 2023-02-14 16:04:06 +01:00