12315 Commits

Author SHA1 Message Date
Claus-Peter Hübner
ba8d02eb8a linting 2023-01-25 22:59:21 +01:00
Claus-Peter Hübner
8f4420f54c Merge branch '2501-feature-federation-implement-a-graphql-client-to-request-getpublickey' of github.com:gradido/gradido into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey 2023-01-25 22:57:12 +01:00
Claus-Peter Hübner
30be532dd5 temporarily removed the not matching community entry deletion after
validation
2023-01-25 22:55:43 +01:00
clauspeterhuebner
99f1b0d240
Update backend/src/federation/validateCommunities.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-01-25 22:49:10 +01:00
Claus-Peter Hübner
b64fad1b7d add the startValidateCommunities again after master-merge 2023-01-25 21:18:18 +01:00
Claus-Peter Hübner
d24b858959 Merge branch '2501-feature-federation-implement-a-graphql-client-to-request-getpublickey' of github.com:gradido/gradido into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey 2023-01-25 21:13:38 +01:00
Claus-Peter Hübner
8cc62c1949 Merge remote-tracking branch 'origin/master' into
2501-feature-federation-implement-a-graphql-client-to-request-getpublickey
2023-01-25 21:12:41 +01:00
clauspeterhuebner
c5bb2ae380
Merge pull request #2459 from gradido/2428-feature-federation-implement-multiple-apollo-graphql-endpoints
feat(backend): federation implement multiple apollo graphql endpoints
2023-01-25 18:12:06 +01:00
clauspeterhuebner
bb30be15ce
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints 2023-01-25 17:25:52 +01:00
clauspeterhuebner
c45c5699f3
Update federation/src/graphql/api/GetTestApiResult.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-01-25 17:21:26 +01:00
Moriz Wahl
d7c2e1ece5 comment unused code to raise coverage 2023-01-25 16:29:37 +01:00
Moriz Wahl
b959a64e77 remove unused TransactionType enumerator to raise coverage 2023-01-25 16:29:18 +01:00
Hannes Heine
a7b19fcc82
Merge pull request #2625 from gradido/legend-to-all-contribution-tab
refactor(frontend): add legend to all contribution tab, and add tests.
2023-01-25 14:06:12 +01:00
mahula
ae0f4f0cc5
Merge branch 'master' into legend-to-all-contribution-tab 2023-01-25 13:51:21 +01:00
elweyn
e7b27a32ee Refactor GetTestApiResult & Add second resolver to version 1_0 2023-01-25 12:29:34 +01:00
clauspeterhuebner
cba5d330a1
Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey 2023-01-25 02:34:42 +01:00
clauspeterhuebner
a3af2e5513
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints 2023-01-25 02:34:29 +01:00
Moriz Wahl
66cec91ed4
Merge pull request #2587 from gradido/unit-tests-community-page
feat(frontend): unit tests community page
2023-01-24 20:01:54 +01:00
elweyn
589df276c0 Add legend to all contribution tab, and add tests for this case. 2023-01-24 16:28:41 +01:00
Moriz Wahl
a24f464fbf
Merge branch 'master' into unit-tests-community-page 2023-01-24 16:13:58 +01:00
Hannes Heine
de0724e51e
Merge pull request #2461 from gradido/2332-mark-contribution-as-rejected
feat(backend): deny contributions
2023-01-24 16:13:29 +01:00
Moriz Wahl
bfb6a9598b
Merge branch 'master' into unit-tests-community-page 2023-01-24 16:05:55 +01:00
elweyn
57222d07c4 Change rejected to deny, add error test for denyContribution & remove TODO comment. 2023-01-24 15:56:58 +01:00
elweyn
2291cc813e Change en translation from deny to reject. 2023-01-24 15:47:31 +01:00
elweyn
4f85b8508d Fix locales. 2023-01-24 15:38:28 +01:00
elweyn
62c85476d4 Correct tests. 2023-01-24 15:29:19 +01:00
elweyn
bfe2aa9246 Merge branch '2332-mark-contribution-as-rejected' of https://github.com/gradido/gradido into 2332-mark-contribution-as-rejected 2023-01-24 15:22:48 +01:00
elweyn
da652e6745 Rename reject to deny and rejected to denied. 2023-01-24 15:22:37 +01:00
Hannes Heine
446754fad4
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-24 15:04:15 +01:00
Hannes Heine
4d40944f1e
Merge pull request #2579 from gradido/update-admin-yarn-lock
refactor(admin): update yarn.lock file of admin.
2023-01-24 15:03:48 +01:00
elweyn
24557ae35b Fix locales. 2023-01-24 14:43:07 +01:00
Hannes Heine
23e3e02139
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-24 08:39:15 +01:00
elweyn
5fa6afbd90 Merge branch 'master' into update-admin-yarn-lock 2023-01-23 10:57:31 +01:00
Moriz Wahl
3b9a553513 localized message 2023-01-20 10:42:16 +01:00
Moriz Wahl
a1b1142128 Merge branch 'master' into unit-tests-community-page 2023-01-20 10:41:29 +01:00
clauspeterhuebner
81bd4d137a
Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey 2023-01-20 02:41:35 +01:00
clauspeterhuebner
4c5cecb108
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints 2023-01-20 02:41:27 +01:00
941c0daa06
Merge pull request #2588 from gradido/v1.17.1
chore(release): v1.17.1
2023-01-20 00:56:52 +01:00
ce40f9a006
Merge branch 'master' into v1.17.1 2023-01-19 22:12:29 +01:00
62e76e02ad
v1.17.1 2023-01-19 22:11:20 +01:00
Alexander Friedland
49ce522eac
Merge pull request #2583 from gradido/word-break-in-contribution
refactor(frontend): change contribution memo add word-break
2023-01-19 21:47:18 +01:00
Moriz Wahl
b997a34aaf coverage frontend to 95% 2023-01-19 19:32:11 +01:00
Moriz Wahl
68dab7a5b4 Merge branch 'master' into unit-tests-community-page 2023-01-19 19:29:42 +01:00
Moriz Wahl
a13c1a3cf5 further tests 2023-01-19 19:29:06 +01:00
0b7fdac38a
removed comment 2023-01-19 18:24:00 +01:00
Moriz Wahl
be65595bee refcator tests for apollo calls 2023-01-19 18:21:00 +01:00
clauspeterhuebner
0189603681
Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey 2023-01-19 18:09:12 +01:00
clauspeterhuebner
c4df2be4a7
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints 2023-01-19 18:09:05 +01:00
Alexander Friedland
8ef9b240e4
Merge branch 'master' into word-break-in-contribution 2023-01-19 16:06:21 +01:00
Alexander Friedland
dc7dead09a
Merge pull request #2584 from gradido/admin-text-memo-add-text-break
refactor(admin): add text-break on all table memo fields
2023-01-19 16:06:03 +01:00