13932 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	67a5458a97	fix tests	2023-04-11 13:12:51 +02:00
Ulf Gebhardt	06fc7a729c	merge	2023-04-11 13:03:37 +02:00
Ulf Gebhardt	9c461da0e7	fix emails	2023-04-11 13:01:58 +02:00
Alexander Friedland	38759981f0	Merge pull request #2902 from gradido/2818-pagination-is-not-reset-when-switching-tabs ... fix(admin): pagination set currentPage by switch tabs	2023-04-11 12:59:34 +02:00
Ulf Gebhardt	3eb95e19b9	emails are async again	2023-04-11 12:53:59 +02:00
Moriz Wahl	2e88ac3cb9	move describe block	2023-04-11 12:38:25 +02:00
Moriz Wahl	94f0963313	test reset current page on tab change properly	2023-04-11 12:35:20 +02:00
Hannes Heine	9009382e80	Merge branch 'master' into 2818-pagination-is-not-reset-when-switching-tabs	2023-04-11 12:21:14 +02:00
mahula	6958bf7bba	Merge pull request #2931 from gradido/fix-community-url ... fix(federation): correct export of the community url	2023-04-11 12:04:45 +02:00
elweyn	c69c6c3c7b	Merge branch '2595-visualize-the-federation' into fix-community-url	2023-04-11 11:51:20 +02:00
mahula	0cf372edb2	correct community urls in unit tests	2023-04-11 11:46:43 +02:00
elweyn	781cdde282	Merge branch '2595-visualize-the-federation' into fix-community-url	2023-04-11 11:41:03 +02:00
mahula	8d1eacddde	correct comminity urls in unit tests	2023-04-11 11:35:41 +02:00
mahula	22dca7c8d1	finalize unit tests for federation visualization page	2023-04-11 11:12:16 +02:00
elweyn	7536898a0c	Merge branch '2595-visualize-the-federation' into fix-community-url	2023-04-11 10:28:25 +02:00
elweyn	4cea48aeb8	Fix order of the communities	2023-04-11 09:44:21 +02:00
mahula	adcff96e29	transform animation to computed method	2023-04-07 16:53:45 +02:00
mahula	ab8bec8a4e	remove oldPublicKey from federation visualization item component	2023-04-07 16:38:48 +02:00
mahula	206dcda775	use locales array in federation visualization item component	2023-04-07 16:22:28 +02:00
mahula	3e277bcb79	adapt community resolver unit tests to changes	2023-04-07 15:59:50 +02:00
mahula	9435c3620f	add mocks and button unit test to federation visualization in admin interface	2023-04-07 15:19:29 +02:00
mahula	81eed73922	add unit tests for federation visualization in admin interface	2023-04-07 12:57:40 +02:00
mahula	21b358d89a	add unit tests for federation visualization in admin interface	2023-04-07 12:15:53 +02:00
elweyn	5f0788ee9c	Unify env templates.	2023-04-06 23:53:52 +02:00
elweyn	712596fc42	Add missing configs in template files.	2023-04-06 23:48:43 +02:00
elweyn	0bb00a3af4	fix(federation): correct exported of community url.'	2023-04-06 23:35:30 +02:00
Hannes Heine	1d547736a4	Merge branch 'master' into 2595-visualize-the-federation	2023-04-06 17:02:09 +02:00
Hannes Heine	5504160c0a	Merge pull request #2927 from gradido/fix-decay-duration ... fix(frontend): displayed decay duration	2023-04-06 17:00:57 +02:00
Hannes Heine	571a7ed7f2	Merge branch 'master' into fix-decay-duration	2023-04-06 16:42:47 +02:00
Hannes Heine	eadfc8ac7c	Merge pull request #2928 from gradido/fix-community-tab-navigation ... fix(frontend): community tab navigation	2023-04-06 16:42:23 +02:00
Hannes Heine	f8b9f74d90	Merge branch 'master' into fix-community-tab-navigation	2023-04-06 16:30:13 +02:00
Hannes Heine	057d3e8461	Merge pull request #2925 from gradido/fix-moderator-id-in-community-spec ... fix(frontend): moderator id missing	2023-04-06 16:30:02 +02:00
Hannes Heine	4a34b702f2	Merge branch 'master' into fix-moderator-id-in-community-spec	2023-04-06 16:16:46 +02:00
Hannes Heine	b6aa5983fe	Merge pull request #2924 from gradido/fix-reset-send-coins ... fix(frontend): reset button send coins	2023-04-06 16:16:30 +02:00
Hannes Heine	6db9bbf1b2	Merge branch 'master' into fix-reset-send-coins	2023-04-06 16:02:01 +02:00
Ulf Gebhardt	479a8aed1a	Merge pull request #2908 from gradido/eslint-plugin-import-export-style ... refactor(backend): eslint plugin import export style	2023-04-06 15:06:03 +02:00
Ulf Gebhardt	27a89a2734	removed obsolete comment	2023-04-06 14:21:26 +02:00
Ulf Gebhardt	e4fc4438fb	removed obsolete comment	2023-04-06 14:20:41 +02:00
Ulf Gebhardt	f2ad6cc24a	fix merge problem	2023-04-06 14:10:46 +02:00
Ulf Gebhardt	657c171898	merge	2023-04-06 14:05:50 +02:00
Ulf Gebhardt	1b0d9995f7	Merge pull request #2919 from gradido/vscode-intellisense-fixes ... fix(backend): vscode intellisense fixes	2023-04-06 13:58:14 +02:00
Ulf Gebhardt	8d8900c463	fix eslint.rc	2023-04-06 13:39:04 +02:00
Ulf Gebhardt	1a0edb08c5	Merge branch 'master' into vscode-intellisense-fixes	2023-04-06 12:35:34 +02:00
Ulf Gebhardt	6f6749e83a	Merge pull request #2905 from gradido/import-no-cycle-refactor-events ... refactor(backend): eslint import-no-cycle enabled	2023-04-05 19:22:01 +02:00
Ulf Gebhardt	e438502d46	Merge branch 'master' into import-no-cycle-refactor-events	2023-04-05 19:02:12 +02:00
Moriz Wahl	d3ec787d88	remove unused async	2023-04-05 17:29:05 +02:00
Moriz Wahl	f0cfd1b309	fix(frontend): community tab navigation	2023-04-05 17:26:33 +02:00
clauspeterhuebner	fa036741c1	Merge pull request #2881 from gradido/2874-feature-rules-and-blacklisting-for-alias ... docs(backend): alias rules and conventions	2023-04-05 15:58:53 +02:00
clauspeterhuebner	be445a6310	Merge branch 'master' into 2874-feature-rules-and-blacklisting-for-alias	2023-04-05 15:41:50 +02:00
Moriz Wahl	90f4ccd932	set moderator id to null	2023-04-05 15:27:34 +02:00