Claus-Peter Hübner
9f488fb845
Merge branch
...
'2630-feature-federation-implement-a-graphql-endpoint-for-request-getpublickey'
of github.com:gradido/gradido into
2630-feature-federation-implement-a-graphql-endpoint-for-request-getpublickey
2023-02-16 15:42:12 +01:00
Claus-Peter Hübner
62013c6bc1
Merge remote-tracking branch 'origin/master' into
...
2630-feature-federation-implement-a-graphql-endpoint-for-request-getpublickey
2023-02-16 15:38:16 +01:00
clauspeterhuebner
90cc638ab8
Merge pull request #2665 from gradido/2650-feature-federation-harmonize-and-sync-modules-of-federation
...
feat(federation): harmonize and sync modules and data of federation
2023-02-16 15:20:39 +01:00
clauspeterhuebner
2db88d59c0
Merge branch 'master' into 2650-feature-federation-harmonize-and-sync-modules-of-federation
2023-02-16 15:05:54 +01:00
clauspeterhuebner
c793a001f1
Merge pull request #2680 from gradido/2632-feature-dockerfile-for-federation
...
feat(federation): add docker and github-workflow files
2023-02-16 15:05:36 +01:00
clauspeterhuebner
891eef4e9c
Merge branch 'master' into 2632-feature-dockerfile-for-federation
2023-02-16 14:43:02 +01:00
clauspeterhuebner
8e8074d202
Merge branch 'master' into 2650-feature-federation-harmonize-and-sync-modules-of-federation
2023-02-16 14:42:17 +01:00
mahula
660211c82d
Merge pull request #2644 from gradido/2352-feat-user-story-user-authentication-reset-password
...
feat(other): e2e test user authentication reset password
2023-02-16 14:36:04 +01:00
mahula
b0b0275b01
Merge branch 'master' into 2352-feat-user-story-user-authentication-reset-password
2023-02-16 14:16:25 +01:00
clauspeterhuebner
b527894ecf
Merge branch 'master' into 2650-feature-federation-harmonize-and-sync-modules-of-federation
2023-02-16 14:09:20 +01:00
clauspeterhuebner
c2a5482d6a
Merge branch 'master' into 2632-feature-dockerfile-for-federation
2023-02-16 14:07:40 +01:00
Alexander Friedland
0b6f7743a9
Merge pull request #2623 from gradido/2594-contributions-list-frontend
...
refactor(admin): add tabs for all statusus on contributions
2023-02-16 14:07:07 +01:00
Claus-Peter Hübner
583ce91ff0
rework PR-comments
2023-02-16 14:02:31 +01:00
mahula
d68c43c10b
Merge branch 'master' into 2352-feat-user-story-user-authentication-reset-password
2023-02-16 14:02:09 +01:00
Claus-Peter Hübner
d83623a733
Merge branch '2650-feature-federation-harmonize-and-sync-modules-of-federation' of github.com:gradido/gradido into 2650-feature-federation-harmonize-and-sync-modules-of-federation
2023-02-16 13:53:34 +01:00
Claus-Peter Hübner
b83723e972
Merge remote-tracking branch 'origin/master' into 2650-feature-federation-harmonize-and-sync-modules-of-federation
2023-02-16 13:52:25 +01:00
Moriz Wahl
1933bca019
Merge branch 'master' into 2594-contributions-list-frontend
2023-02-16 13:50:47 +01:00
clauspeterhuebner
fcbcfc40b5
Update dht-node/.env.template
...
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-16 13:50:02 +01:00
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
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
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
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
