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 |
|
elweyn
|
0bd3ce27df
|
Change Tests to statusFilter.
|
2023-01-25 16:48:49 +01:00 |
|
elweyn
|
7796d57c97
|
Merge branch '2594-filter-query-all-contributions' of https://github.com/gradido/gradido into 2594-filter-query-all-contributions
|
2023-01-25 16:40:45 +01:00 |
|
elweyn
|
8b3423b91b
|
Remove i18n, change state to status.
|
2023-01-25 16:40:32 +01:00 |
|
Hannes Heine
|
d47310e106
|
Merge branch 'master' into 2594-filter-query-all-contributions
|
2023-01-25 16:30:23 +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 |
|
elweyn
|
96262a2405
|
Add 2370-feature-deleting-contribution-must-be-analog-to-confirming-contribution-dialog changes.
|
2023-01-25 14:44:24 +01:00 |
|
elweyn
|
dc70a375f6
|
Correct merge conflicts.
|
2023-01-25 14:41:03 +01:00 |
|
elweyn
|
22af8012f5
|
Correct merged stash conflicts.
|
2023-01-25 14:37:30 +01:00 |
|
elweyn
|
5e58d6e312
|
Correct merged stash conflicts.
|
2023-01-25 14:36:55 +01:00 |
|
elweyn
|
bd9d62b2d6
|
Change cancel button variant to info, change variant of 'Yes' button to 'danger' for deletedialog, 'warning' for denydialog and 'success' for confirm-dialog
|
2023-01-25 14:30:08 +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
|
2f787043c1
|
Remove some function emits, remove comments of wip.
|
2023-01-25 13:41:35 +01:00 |
|
elweyn
|
2eff5d99cd
|
Add test suite for deny prozess.
|
2023-01-25 13:34:33 +01:00 |
|
elweyn
|
70494a8e11
|
Remove unused local key denyNow, change color of deny button to yellow, change order of confirm and deny buttons.
|
2023-01-25 13:10:46 +01:00 |
|
mahula
|
eccb74baea
|
fix linting
|
2023-01-25 12:38:16 +01:00 |
|
elweyn
|
e7b27a32ee
|
Refactor GetTestApiResult & Add second resolver to version 1_0
|
2023-01-25 12:29:34 +01:00 |
|
Hannes Heine
|
309eddd841
|
Merge branch 'master' into 2370-feature-deleting-contribution-must-be-analog-to-confirming-contribution-dialog
|
2023-01-25 12:21:37 +01:00 |
|
mahula
|
cc4c8ce351
|
refactor overlay conditions on admin creation confirmation page
|
2023-01-25 12:11:56 +01:00 |
|
elweyn
|
9e7da0f451
|
Add tests for filterState parameter in listAllContributions query.
|
2023-01-25 08:11:47 +01:00 |
|
elweyn
|
47eea57c09
|
Remove unused import.
|
2023-01-25 08:00:34 +01:00 |
|
elweyn
|
cc0fe5968d
|
Tests that the filterState parameter in listAllContributions works as expected.
|
2023-01-25 07:54:17 +01:00 |
|
Hannes Heine
|
d91857b1a4
|
Merge branch 'master' into 2594-filter-query-all-contributions
|
2023-01-25 06:38:51 +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
|
2cecadded2
|
Add filterState to the backend test listAllContributions query.
|
2023-01-24 17:02:08 +01:00 |
|
ogerly
|
2e078a5fbb
|
fix: lint and locales
|
2023-01-24 17:00:50 +01:00 |
|
ogerly
|
ff614ad27b
|
add info text, locales in community page, if no contributions
|
2023-01-24 16:58:56 +01:00 |
|
ogerly
|
5bd37a5a2a
|
fix: locales
|
2023-01-24 16:52:28 +01:00 |
|
ogerly
|
295dbff4f8
|
show info if no open contribution for selected date
|
2023-01-24 16:51:56 +01:00 |
|
elweyn
|
589df276c0
|
Add legend to all contribution tab, and add tests for this case.
|
2023-01-24 16:28:41 +01:00 |
|
Hannes Heine
|
14c546627a
|
Merge branch 'master' into 2594-filter-query-all-contributions
|
2023-01-24 16:14:21 +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 |
|