4428 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ogerly	eed923e11f	Add Nav-Item Overview / Übersicht	2021-11-26 09:10:17 +01:00
ogerly	32f0271f0b	b-button size from lg to md	2021-11-26 09:03:57 +01:00
ogerly	b2773b3134	b-input-groupe range to STRING	2021-11-26 09:03:14 +01:00
ogerly	667467396a	Set createdIndex to null, after sending the creation	2021-11-26 08:53:35 +01:00
ogerly	9ab0a32519	Change Style formular amount range and number input	2021-11-26 08:25:20 +01:00
elweyn	56bc852968	Merge the two changes.	2021-11-26 08:02:05 +01:00
ogerly	e59527103b	remove variable createdIndexSum	2021-11-26 07:56:42 +01:00
ogerly	5ae2258e9b	show and hide amount in formular	2021-11-26 07:54:08 +01:00
ogerly	7169a3635d	adding formatter function on table field creation. Formatter Funktion Object to String	2021-11-26 07:54:08 +01:00
Hannes Heine	e34b6f7137	Add package vue-toasted	2021-11-26 07:54:08 +01:00
Hannes Heine	927c61ae6e	Merge branch 'master' into admin_pending_creation	2021-11-26 06:52:26 +01:00
Ulf Gebhardt	d894358426	Merge pull request #1126 from gradido/backend_rights ... backend_rights	2021-11-25 18:53:25 +01:00
Hannes Heine	95bdbfefbe	Implemented the apollo createPendingCreation and update rowItem.creations	2021-11-25 13:35:12 +01:00
Hannes Heine	c43b3491f0	Created new query for createPendingCreations	2021-11-25 13:34:13 +01:00
Hannes Heine	9049427103	Added method to update user row creation	2021-11-25 13:33:22 +01:00
Hannes Heine	9d168f07e7	Change default id of moderator	2021-11-25 13:32:33 +01:00
Hannes Heine	33c50560d6	creationDate to string and changed the other parameters to int	2021-11-25 12:06:14 +01:00
Hannes Heine	ade3719c33	Changed the response to array of openCreations.	2021-11-25 10:55:12 +01:00
Hannes Heine	4f61af06aa	Withdrew console.logs and changed creationDate type from any to Date.	2021-11-25 10:22:42 +01:00
Hannes Heine	45b61547cc	change store moderation information	2021-11-25 10:21:30 +01:00
Hannes Heine	b8e3c9a376	change formular store moderation information, change SubmitObject	2021-11-25 10:18:41 +01:00
Hannes Heine	03cb7fa558	Create entry in LoginPendingTaskAdmin table. Save creation in database.	2021-11-25 10:15:34 +01:00
Ulf Gebhardt	897ff2ec6c	comment	2021-11-25 10:02:17 +01:00
Ulf Gebhardt	fddc39efe5	compare with jwt assigne drole on verifyLogin instead of database query again	2021-11-25 09:57:27 +01:00
Hannes Heine	ead93b98fd	Implemented check if creation is allowed.	2021-11-25 09:54:22 +01:00
Ulf Gebhardt	ffc45d5cde	implemented JWT Admin role assignment	2021-11-25 09:52:01 +01:00
Ulf Gebhardt	08f7952ad7	implemened isAdmin	2021-11-25 09:51:38 +01:00
Ulf Gebhardt	39f1b9cf9f	ServerUser Repository	2021-11-25 09:51:17 +01:00
Ulf Gebhardt	f8570c2693	fixed ServerUser entity definition	2021-11-25 09:51:03 +01:00
ogerly	13a21b5a29	add disabled radio button when creation 0	2021-11-25 09:25:20 +01:00
Ulf Gebhardt	4e762a12fc	removed duplicate admin link (merge error)	2021-11-25 09:25:01 +01:00
Ulf Gebhardt	e838af8d4b	elopage hook problem	2021-11-25 09:23:23 +01:00
Hannes Heine	1c96161401	Replaced fix dates from pending queries to the calculated dates, withdrew comments.	2021-11-25 09:22:49 +01:00
Ulf Gebhardt	0565ff4d85	reverted createUser process - this is done in another PR	2021-11-25 09:18:37 +01:00
Ulf Gebhardt	31a3837fa5	right check for searchUsers & verifyLogin	2021-11-25 09:01:23 +01:00
Hannes Heine	72f06ede08	Change the date calculation so we get the three last month and next month as string and search with this values.	2021-11-25 08:57:40 +01:00
Hannes Heine	c801d7c07c	Adding moment package to backend in yarn lock.	2021-11-25 08:56:21 +01:00
Hannes Heine	e399ce6e27	Adding moment package to backend.	2021-11-25 08:55:49 +01:00
Ulf Gebhardt	754bd89723	lint	2021-11-25 08:49:47 +01:00
Ulf Gebhardt	77dc54155a	Merge branch 'master' into backend_rights ... # Conflicts: # admin/src/router/guards.js # admin/src/store/store.js # backend/src/graphql/resolver/UserResolver.ts # frontend/src/components/SidebarPlugin/SideBar.vue # frontend/src/graphql/queries.js # frontend/src/routes/guards.js	2021-11-25 08:49:06 +01:00
Hannes Heine	1d612c034e	add users Promis all	2021-11-25 08:08:27 +01:00
Moriz Wahl	2f92aec460	Merge branch 'master' into admin_pending_creation	2021-11-24 21:27:44 +01:00
Moriz Wahl	67594ce6ee	Merge pull request #1125 from gradido/login_admin_interface ... Login admin interface	2021-11-24 21:23:23 +01:00
Moriz Wahl	62b3600ac7	coverage unit tests admin interface 51%	2021-11-24 21:12:59 +01:00
Moriz Wahl	e0e707e680	test router navigation guards	2021-11-24 21:11:33 +01:00
Ulf Gebhardt	fcd475f80d	fixed footer merge error	2021-11-24 19:49:33 +01:00
Moriz Wahl	fd9f6f6d55	fix error caused by merging	2021-11-24 19:49:17 +01:00
Moriz Wahl	7c49600df6	test logout action in store	2021-11-24 19:43:31 +01:00
Ulf Gebhardt	a3b87c39bf	moved hasRight into Role class ... defined roles better	2021-11-24 19:41:26 +01:00
Ulf Gebhardt	a24c6119a6	check rights on all resolvers	2021-11-24 19:41:26 +01:00