12551 Commits

Author SHA1 Message Date
mahula
274bd8b864 set correct locale key in contribution deleted email template 2023-02-08 08:39:11 +01:00
mahula
cf9b06824b set right to deny a contribution 2023-02-08 08:37:49 +01:00
mahula
0b1d6b5237 add deying to events and event protocol 2023-02-07 21:56:32 +01:00
mahula
2fc2ecf5af WIP add elements to get contribution denying working in backend 2023-02-07 21:46:44 +01:00
mahula
5c42ec828a fix admin right to deny confirmation 2023-02-07 21:40:02 +01:00
mahula
f980ca20b1 adapt backend's email sending to added deletion email 2023-02-07 21:11:34 +01:00
mahula
bd9307612f adapt backend locales to changes regarding denying and deleting contributuins 2023-02-07 21:10:35 +01:00
mahula
9c282c0142 add email template for deleted contributions 2023-02-07 21:09:16 +01:00
0b8ac928cf
more detailed error messages 2023-02-07 18:24:20 +01:00
ff335d81f3
Merge branch 'master' into logger_contributionMessageResolver 2023-02-07 15:17:17 +01:00
36e8e2c38d
Merge pull request #2662 from gradido/logger_contributionLinkResolver
refactor(backend): use LogError on contributionLinkResolver
2023-02-07 15:16:57 +01:00
a04d4d3985
remove empty string check since we do a length check on memeo & name 2023-02-07 11:01:35 +01:00
db1ed715ca
Merge branch 'master' into logger_contributionLinkResolver 2023-02-07 10:59:40 +01:00
elweyn
e706a3c844 Merge branch 'do-not-compile-for-test-changes' of https://github.com/gradido/gradido into do-not-compile-for-test-changes 2023-02-07 07:10:15 +01:00
elweyn
8544eb51e9 Fix some lint problems. 2023-02-07 07:10:01 +01:00
Hannes Heine
78a83dd87d
Merge branch 'master' into do-not-compile-for-test-changes 2023-02-07 07:07:20 +01:00
078a7432bb
Merge pull request #2670 from gradido/event_protocol_remove_config_switch
refactor(backend): remove event protocol config switch
2023-02-07 01:43:11 +01:00
151f381d94
fix config aggregation on dht-node & backend 2023-02-07 00:29:07 +01:00
4d3ea26365
remove comment on federation 2023-02-07 00:17:49 +01:00
24ca1563b8
remove EVENT_PROTOCOL_DISABLED from dht-node 2023-02-07 00:17:37 +01:00
5a78228af3
remove EVENT_PROTOCOL_DISABLED from backend & bare_metal deployment 2023-02-07 00:16:53 +01:00
8086a4ac46
Merge pull request #2652 from gradido/refactor_event_protocol
refactor(backend): event protocol
2023-02-07 00:03:32 +01:00
1dd2a369e2
Merge branch 'master' into refactor_event_protocol 2023-02-06 23:48:39 +01:00
Moriz Wahl
cb748d8c50 refactor(backend): get last transaction by only one function 2023-02-06 18:47:58 +01:00
elweyn
8b502c940c Remove rebuild of admin, backend and frontend in case there tests files have been changed. 2023-02-06 15:35:11 +01:00
ab96a38dd3
remove unused import 2023-02-03 01:25:24 +01:00
33e87ddd92
fix logger on contributionMessageResolver 2023-02-03 00:13:25 +01:00
ee8a338ec4
fix logger on contributionLinkResolver 2023-02-02 23:49:35 +01:00
Alexander Friedland
9879df4eb5
Merge pull request #2649 from gradido/2608-Design-breaks-on-w-1033px
refactor(frontend): sidebar becomes smaller when critical phase
2023-02-02 17:07:33 +01:00
Alexander Friedland
cb1a4f6b94
Merge branch 'master' into 2608-Design-breaks-on-w-1033px 2023-02-02 16:46:03 +01:00
9f906f4939
Merge pull request #2656 from gradido/logger_sendEMailTranslated
refactor(backend): use LogError on sendEMailTranslated
2023-02-02 16:34:24 +01:00
fdf22daec7
use LogError 2023-02-02 13:04:47 +01:00
48dc2821c5
Merge pull request #2640 from gradido/log-error
refactor(backend): log error class
2023-02-02 13:01:06 +01:00
9b057c5c10
Merge branch 'master' into log-error 2023-02-02 12:16:12 +01:00
Hannes Heine
a95cf81113
Merge pull request #2619 from gradido/2594-filter-query-all-contributions
feat(backend): add filterState parameter to listAllContributions query
2023-02-02 12:04:01 +01:00
Hannes Heine
a763db27d1
Merge branch 'master' into 2594-filter-query-all-contributions 2023-02-02 11:31:34 +01:00
elweyn
f1c0f0bd69 Merge branch '2594-filter-query-all-contributions' of https://github.com/gradido/gradido into 2594-filter-query-all-contributions 2023-02-02 11:22:57 +01:00
elweyn
471685bbd7 Change statusFilters to statusFilter. 2023-02-02 11:22:47 +01:00
Alexander Friedland
4ad6247f0d
Merge branch 'master' into 2608-Design-breaks-on-w-1033px 2023-02-02 10:37:53 +01:00
Alexander Friedland
6cc57eca2e
Merge branch 'master' into 2604-Text-Generate-Link-incorrect 2023-02-02 10:34:21 +01:00
Alexander Friedland
63b6e9491a
Update frontend/src/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-02-02 10:33:51 +01:00
Alexander Friedland
3ed6c686fb
Merge pull request #2626 from gradido/2616-There-is-no-message-when-a-month-is-fully-created
refactor(frontend): there is no message when a month is fully created
2023-02-02 10:33:31 +01:00
Hannes Heine
a959d295bb
Merge branch 'master' into 2594-filter-query-all-contributions 2023-02-02 09:18:52 +01:00
Hannes Heine
c659264e82
Update backend/src/graphql/resolver/ContributionResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-02 09:18:16 +01:00
Hannes Heine
676c6b2e7e
Update backend/src/graphql/resolver/ContributionResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-02 09:14:48 +01:00
Hannes Heine
27b54555ea
Update backend/src/graphql/resolver/ContributionResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-02 09:14:37 +01:00
Hannes Heine
44dabe0486
Update backend/src/graphql/resolver/ContributionResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-02 09:14:24 +01:00
Hannes Heine
55e830ee8d
Update backend/src/graphql/resolver/ContributionResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-02 09:14:04 +01:00
7288bfc7dc
properly use logger 2023-02-02 04:20:36 +01:00
357588a680
define type properly 2023-02-02 04:08:07 +01:00