11341 Commits

Author SHA1 Message Date
ogerly
4551e4b561 fix lint 2022-11-26 10:37:08 +01:00
ogerly
9be6927603 all unused code outcommend 2022-11-25 16:37:59 +01:00
ogerly
ce74e83b57 fix locales and stylelint 2022-11-25 13:19:47 +01:00
ogerly
a89f809315 resolve conflicts 2022-11-25 13:17:17 +01:00
ogerly
fa2ca76554 review from ulf 2022-11-25 12:02:05 +01:00
Alexander Friedland
ebefe46b03
Update frontend/src/assets/scss/gradido-template-dark.scss
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-11-25 10:39:28 +01:00
ogerly
c4e671256a step 1 from new style done 2022-11-25 10:37:08 +01:00
clauspeterhuebner
bfccd815d3
Merge pull request #2301 from gradido/2267-feature-gradido-roadmap
feat(other): feature gradido roadmap
2022-11-24 21:56:42 +01:00
clauspeterhuebner
1314ed5263
Merge branch 'master' into 2267-feature-gradido-roadmap 2022-11-24 21:22:45 +01:00
ogerly
5f3b19c595 contributionList style 2022-11-24 12:06:24 +01:00
jjimenezgarcia
8b9eb4a522
Merge pull request #2353 from gradido/new-password-encryption
refactor(backend): new password encryption implementation
2022-11-24 12:00:20 +01:00
jjimenezgarcia
d8f5cda0fc
Merge branch 'master' into new-password-encryption 2022-11-24 11:26:02 +01:00
joseji
2a74b92472 user saving on db 2022-11-24 11:21:47 +01:00
ogerly
842864d0dc new community style prepared 2022-11-24 04:51:40 +01:00
mahula
66da74c77a
Merge pull request #2399 from gradido/2317-refactor-admin-statistics-on-its-own-page
refactor(admin): statistics in a table and on separate page in admin area
2022-11-23 14:22:36 +01:00
joseji
60e3f62832 enum use on community user initialization 2022-11-23 11:32:27 +01:00
mahula
4dfd78ebd7 adapt unit test to test rendering of the data on admin area statistics page 2022-11-23 08:58:39 +01:00
mahula
abe61f9c8c adapt unit test for admin area routing 2022-11-22 13:41:09 +01:00
ogerly
f8e1514bb2 style transactions list, style plugins 2022-11-22 13:20:41 +01:00
mahula
8348d612b6 adapt unit test for admin area statistics page 2022-11-22 13:08:14 +01:00
joseji
e55f516c51 removed unused import 2022-11-22 11:19:42 +01:00
joseji
3aeb9dd0f1 fixes added 2022-11-22 11:12:18 +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
ogerly
e9ba63d0ec style shadow, backgrounds 2022-11-21 17:19:38 +01:00
ogerly
f3d8e496d6 app center, max width 1320px 2022-11-21 15:26:27 +01:00
ogerly
5ea426506c repared profil 2022-11-21 13:35:28 +01:00
ogerly
63ee06f347 Structure of the community prepared 2022-11-21 05:28:53 +01:00
jjimenezgarcia
b5c6f185ac
Merge branch 'master' into new-password-encryption 2022-11-20 18:15:16 +01:00
joseji
fc23fc9e87 fixes done 2022-11-20 18:14:43 +01:00
ogerly
41e532b26d communty button for tab navigation 2022-11-20 12:45:37 +01:00
ogerly
734826a8b5 Commmunity page, new tabsystem with hashes 2022-11-20 12:37:33 +01:00
mahula
fa78db6d8b use apollo object in community statistics page 2022-11-20 11:13:30 +01:00
ogerly
3a5de83f67 remove unused code 2022-11-20 08:17:13 +01:00
ogerly
acd1c8bf8e right-side and content-header areas prepared 2022-11-20 08:09:19 +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
ogerly
82544930e3 ContentHeader && RideSide Structur 2022-11-17 18:17:05 +01:00
ogerly
a44f9583c2 skeleton struktur, bg-image svg 2022-11-17 18:17:05 +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
joseji
39d006351d unused import added wrongly 2022-11-17 14:10:46 +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