11259 Commits

Author SHA1 Message Date
mahula
abe61f9c8c adapt unit test for admin area routing 2022-11-22 13:41:09 +01:00
mahula
8348d612b6 adapt unit test for admin area statistics page 2022-11-22 13:08:14 +01:00
mahula
7ef66e9da4 remove undefines elements from StatisticTable compoment 2022-11-22 09:17:23 +01:00
mahula
7c4e252757 fix typo in unit test 2022-11-22 09:01:55 +01:00
mahula
fa78db6d8b use apollo object in community statistics page 2022-11-20 11:13:30 +01:00
mahula
5abc930987 change locales details key to plural 2022-11-17 22:11:21 +01:00
mahula
992992ea2a
Merge branch 'master' into 2317-refactor-admin-statistics-on-its-own-page 2022-11-17 21:21:25 +01:00
mahula
0cf556542a fix order in en.json 2022-11-17 21:20:08 +01:00
mahula
419dca99e8 adapt and write unit tests for statistics page in admin area 2022-11-17 19:23:03 +01:00
mahula
cc835dc960 linting 2022-11-17 19:12:49 +01:00
mahula
116dfa8aca set auto width for statistics table and right align text in colunms 2022-11-17 18:48:37 +01:00
mahula
fa734edbbe move statistics nav element to the right 2022-11-17 18:46:23 +01:00
Wolfgang Huß
effa070f84
Merge pull request #2163 from gradido/1288-email-templates
feat(backend): 🍰 Email Templates
2022-11-17 14:40:39 +01:00
Wolfgang Huß
f3c6316a92 Merge branch '1288-email-templates' of github.com:gradido/gradido into 1288-email-templates 2022-11-17 13:55:21 +01:00
Wolfgang Huß
cd8c0b88ae Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates
# Conflicts:
#	backend/src/graphql/resolver/UserResolver.ts
2022-11-17 13:54:50 +01:00
Wolfgang Huß
c5469df997 Give 'html' tag the language of the email receiver 2022-11-17 13:50:01 +01:00
Wolfgang Huß
038d7a6a5f Refine and cleanup documentation 2022-11-17 13:49:18 +01:00
Moriz Wahl
7373a02796
Merge pull request #2393 from gradido/fix-timezone-problems
fix(backend): timezone problems
2022-11-17 10:59:41 +01:00
Moriz Wahl
36185a286a move clear all mocks to correct position 2022-11-16 14:42:45 +01:00
Moriz Wahl
eac290919d avoid reverse, restore removed clear mocks 2022-11-16 14:38:38 +01:00
Moriz Wahl
103790cccf use jest.fn() for void function, correct timezone offset 2022-11-16 14:24:17 +01:00
Moriz Wahl
e4e308cdb4 fix seeds 2022-11-15 14:34:20 +01:00
Moriz Wahl
ef79580387 required argument client time zone offset for utils in creation 2022-11-15 14:20:33 +01:00
Moriz Wahl
d36fee0302 change order off arguements, implement changes for admin and contribution resolver 2022-11-15 14:10:18 +01:00
Moriz Wahl
b7cf290171 setup tests for client time zone offset 2022-11-15 14:09:33 +01:00
Moriz Wahl
fbc1b2bc32 fix get client time zone offset 2022-11-15 14:08:53 +01:00
Moriz Wahl
e89e30e33e change client request time to client timezone offset 2022-11-15 13:14:25 +01:00
Moriz Wahl
1b6dab32bf change client request time to client time zone offset 2022-11-15 13:03:42 +01:00
Moriz Wahl
cff2396bd1 change client request time to client time zone offset 2022-11-15 13:00:59 +01:00
Moriz Wahl
6ae1ba79f7 Merge branch 'master' into fix-timezone-problems 2022-11-15 12:57:02 +01:00
Wolfgang Huß
3b0c937418
Merge branch 'master' into 1288-email-templates 2022-11-15 07:48:47 +01:00
cfe9a03933
Merge pull request #2391 from gradido/v1.14.1
chore(release): version 1.14.1 - hotfix
2022-11-14 21:28:17 +01:00
debc27549f
v1.14.1 2022-11-14 21:13:41 +01:00
cc1aea0be1
Merge pull request #2390 from gradido/closeAllOpenCollapse-in-methodes-getListContributionMessages
fix(frontend): load contributionMessages is fixed
2022-11-14 21:11:36 +01:00
Moriz Wahl
dca8763472 remove depricated test 2022-11-14 20:57:25 +01:00
ogerly
428c4fd22d remove unused code 2022-11-14 20:38:55 +01:00
ogerly
1a34db8b18 fix test 2022-11-14 20:36:34 +01:00
ogerly
ee570e9578 fix errors 2022-11-14 20:22:36 +01:00
Alexander Friedland
24e5c265a0
Merge branch 'master' into closeAllOpenCollapse-in-methodes-getListContributionMessages 2022-11-14 19:48:45 +01:00
ogerly
fd1fb07184 load contributionMessages is fixed 2022-11-14 19:42:54 +01:00
8fc8240e6a
Merge pull request #2389 from gradido/release-1.14.0
chore(release): version 1.14.0
2022-11-14 18:01:34 +01:00
Moriz Wahl
b7bc0520d2 release: Version 1.14.0 2022-11-14 17:44:48 +01:00
Alexander Friedland
d9ef1c78fa
Merge pull request #2388 from gradido/2380-Community-tab-change-must-close-conversation-window
fix(frontend): close all open collapse by change tabs in community
2022-11-14 17:43:44 +01:00
ogerly
1b3a25eb0d close all open collapse if tab new constribution and if edit 2022-11-14 17:27:43 +01:00
ogerly
6e83d9447a add test, coverage to over 95% 2022-11-14 16:49:00 +01:00
ogerly
c7f5acf287 same event on chat-dot icon 2022-11-14 15:31:42 +01:00
Alexander Friedland
5d87fd4922
Merge branch 'master' into 2380-Community-tab-change-must-close-conversation-window 2022-11-14 15:26:30 +01:00
ogerly
1afac12aa8 close open messagebox by open another messagebox 2022-11-14 15:23:44 +01:00
mahula
14351f2004 linting 2022-11-14 14:38:57 +01:00
ogerly
6a47ba7829 close all open collapse by change tabs in community 2022-11-14 14:29:16 +01:00