11308 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	7bc99a86dc	Merge pull request #2385 from gradido/jest_is_dev_depenency ... fix(backend): moved all jest & type-definition related packages into the `devDependencies` section	2022-11-27 00:18:55 +01:00
Ulf Gebhardt	71b1d409b9	Merge branch 'master' into jest_is_dev_depenency	2022-11-27 00:05:22 +01:00
Moriz Wahl	45d58fe6e5	Merge pull request #2425 from gradido/v1.15.0 ... chore(release): v1.15.0	2022-11-26 13:16:36 +01:00
Ulf Gebhardt	2caf0ee664	v1.15.0	2022-11-26 01:14:24 +01:00
Moriz Wahl	9556e196ab	Merge pull request #2423 from gradido/fix-balance-migration ... fix(database): wrong balance and decay values	2022-11-25 18:22:06 +01:00
Ulf Gebhardt	2c3cac5939	Merge branch 'master' into fix-balance-migration	2022-11-25 17:48:28 +01:00
Moriz Wahl	bd49a1e80d	Merge pull request #2422 from gradido/fix-wrong-balance ... fix(backend): wrong balance after transaction receive	2022-11-25 15:19:31 +01:00
Moriz Wahl	aa1a88bc11	Merge branch 'master' into fix-wrong-balance	2022-11-25 14:44:39 +01:00
Moriz Wahl	9253706513	remove comment	2022-11-25 14:32:23 +01:00
Moriz Wahl	62c48712a4	fix misspelled text	2022-11-25 14:32:12 +01:00
Ulf Gebhardt	bc0cbfe2f7	lint fix	2022-11-25 14:24:47 +01:00
Ulf Gebhardt	1ea8eb1815	create log folder	2022-11-25 14:23:47 +01:00
Ulf Gebhardt	0f71a486a5	log affected accounts & some fixes	2022-11-25 14:13:22 +01:00
Ulf Gebhardt	4bb82f2933	Merge branch 'master' into jest_is_dev_depenency	2022-11-25 03:42:17 +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
Moriz Wahl	f2e8846932	rename migration file, set new db version in backend	2022-11-24 16:37:32 +01:00
Moriz Wahl	63e22eeab8	fix(database): wrong balance and decay values	2022-11-24 16:30:55 +01:00
Ulf Gebhardt	bd28a888a6	Merge branch 'master' into jest_is_dev_depenency	2022-11-24 13:40:59 +01:00
Moriz Wahl	77d93f18fa	remove test	2022-11-24 13:13:01 +01:00
Moriz Wahl	b3e880d45f	undo refactoring	2022-11-24 13:03:50 +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
Ulf Gebhardt	f4a9aa1a68	Merge branch 'master' into jest_is_dev_depenency	2022-11-23 18:06:20 +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
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
Ulf Gebhardt	41891c1b57	Merge branch 'master' into jest_is_dev_depenency	2022-11-21 17:19:12 +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
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
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