4520 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	73a49eacff	Merge branch 'master' into adminPendingCreationQueries	2021-12-02 10:35:01 +01:00
Alexander Friedland	1605cea902	Merge pull request #1147 from gradido/1137-PublisherId-as-input-field-on-register ... 1137 publisher id as input field on register	2021-12-02 10:31:21 +01:00
Alexander Friedland	e5d24fee35	Merge branch 'master' into 1137-PublisherId-as-input-field-on-register	2021-12-02 09:40:43 +01:00
Alexander Friedland	ed7c702d0e	Merge pull request #1135 from gradido/admin_pending_creation ... Admin pending creation	2021-12-02 09:39:19 +01:00
ogerly	36d3850c3f	yarn lint --fix	2021-12-02 09:20:38 +01:00
ogerly	fc799a78eb	test von store commit publisherId, test store isAdmin	2021-12-02 09:19:35 +01:00
elweyn	6e38477be8	Merge branch 'admin_pending_creation' into adminPendingCreationQueries	2021-12-02 07:06:54 +01:00
elweyn	4e1baeae2e	Test the apollo query for verifyLogin so we get the moderator before an creation.	2021-12-02 07:06:38 +01:00
elweyn	640109d8bf	Merge moderator search from admin_pending_creation.	2021-12-02 06:32:00 +01:00
elweyn	1004718892	Added moderator query to the creationFormular so we can send the right moderator id.	2021-12-02 06:30:41 +01:00
ogerly	21b8110f57	jest test for input publisherId commit to store	2021-12-01 18:51:12 +01:00
ogerly	31adf5d6e2	jest test for input publisherId	2021-12-01 18:39:25 +01:00
ogerly	c7ab1ee271	remove all console logs	2021-12-01 17:55:03 +01:00
ogerly	09cdd00c82	Add Methods commitStore() for publisherId	2021-12-01 17:53:58 +01:00
Alexander Friedland	2bb11230f6	Update frontend/src/views/Pages/Register.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2021-12-01 15:34:19 +01:00
Alexander Friedland	6a4379f9cd	Update frontend/src/locales/de.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2021-12-01 15:34:08 +01:00
elweyn	da71446fc5	Merge admin_pending_creation and lowered the admin coverage.	2021-12-01 09:23:52 +01:00
elweyn	0e592fd353	Added some tests and reduce coverage since we removed comments.	2021-12-01 09:22:08 +01:00
elweyn	c71eccec0e	Merge branch 'admin_pending_creation' into adminPendingCreationQueries	2021-11-30 14:59:13 +01:00
elweyn	daeb0ed32c	Change create method from query to mutation.	2021-11-30 14:58:47 +01:00
ogerly	efb106f960	yarn lint --fix	2021-11-30 14:57:38 +01:00
ogerly	bc21f76848	Insert publishID from Store when set	2021-11-30 14:57:04 +01:00
ogerly	eece84d007	yarn locales --fix	2021-11-30 13:58:34 +01:00
ogerly	2de8684ca3	Add edit locales for german PublisherID for Herausgeber ID	2021-11-30 13:57:40 +01:00
ogerly	a1018b526d	Add locales for PublisherID	2021-11-30 13:56:22 +01:00
ogerly	75ec2a6e8c	Add PublisherID locales in DOM and english	2021-11-30 13:54:33 +01:00
ogerly	57e8be75a6	Add PublisherID locales in DOM and german	2021-11-30 13:52:57 +01:00
ogerly	5206e27a7a	Add PublisherID input box per collaps	2021-11-30 13:44:42 +01:00
elweyn	bd9ce97bc5	Merge branch 'admin_pending_creation' into adminPendingCreationQueries	2021-11-30 10:33:02 +01:00
elweyn	e47a95cd4b	Change note to memo in database.	2021-11-30 10:31:43 +01:00
Hannes Heine	be8c91d752	Merge branch 'master' into admin_pending_creation	2021-11-30 10:22:28 +01:00
elweyn	3a5999ffe5	Change note to memo.	2021-11-30 10:11:28 +01:00
elweyn	ffed004b1a	Merge branch 'admin_pending_creation' into adminPendingCreationQueries	2021-11-30 10:10:15 +01:00
elweyn	e2743b979e	Change note to memo.	2021-11-30 10:08:12 +01:00
elweyn	fd54f34855	Remove comment in logout.	2021-11-30 09:55:27 +01:00
Hannes Heine	718763a884	Update admin/src/components/CreationFormular.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2021-11-30 09:42:09 +01:00
Hannes Heine	bdad4197a3	fix logo import ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2021-11-30 09:41:44 +01:00
elweyn	84be6ae369	Remove empty and unused file.	2021-11-30 09:35:33 +01:00
elweyn	bd5aebbfd5	Coverage upgraded to 53% in admin.	2021-11-30 09:30:37 +01:00
Moriz Wahl	cf3260b21e	Merge pull request #1121 from gradido/setup-seeding ... feat: Setup Data Seeding	2021-11-30 09:29:15 +01:00
elweyn	da649868cc	Removed the remove test that removes all creations, Test that the server sends error.	2021-11-30 09:28:59 +01:00
Moriz Wahl	6eedde23af	recover reset to get CI running again	2021-11-30 09:18:57 +01:00
elweyn	5a3fb2bd80	Merge branch 'admin_pending_creation' into adminPendingCreationQueries	2021-11-30 08:52:17 +01:00
elweyn	1b48589933	Change backend coverage to 39.	2021-11-30 08:51:47 +01:00
Moriz Wahl	50e98bdc46	disbale create admin user	2021-11-30 08:51:40 +01:00
Moriz Wahl	0d2cf7da48	Merge branch 'master' into setup-seeding	2021-11-30 08:46:24 +01:00
elweyn	65461130bb	Merge branch 'admin_pending_creation' into adminPendingCreationQueries	2021-11-30 08:29:26 +01:00
Moriz Wahl	0c74fa2970	remove broken test	2021-11-29 21:57:10 +01:00
Moriz Wahl	dbdd25293b	test new navbar elements, raise coverage to 52%	2021-11-29 21:47:49 +01:00
Ulf Gebhardt	a8a1f9cff4	Merge pull request #1139 from gradido/fix_admin_token_renewal ... fix_admin_token_renewal	2021-11-29 16:38:50 +01:00