1349 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	4e762a12fc	removed duplicate admin link (merge error)	2021-11-25 09:25:01 +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
Ulf Gebhardt	6ea8d08963	fix tests	2021-11-24 19:38:42 +01:00
Ulf Gebhardt	5184d1dd2d	fixed locales	2021-11-24 19:38:42 +01:00
Ulf Gebhardt	33783702bc	frontend lint	2021-11-24 19:38:42 +01:00
Ulf Gebhardt	cefc963780	implemented isAdmin from backend	2021-11-24 19:38:42 +01:00
Ulf Gebhardt	6119d38561	corrected ports	2021-11-24 19:37:06 +01:00
Ulf Gebhardt	d49e4728a5	todo port & define port due to my setup	2021-11-24 19:37:06 +01:00
Ulf Gebhardt	3301e0763d	separate router.beforeach & implement the authenticate route	2021-11-24 19:37:06 +01:00
Ulf Gebhardt	a8995141c8	link to admin if isAdmin is true	2021-11-24 19:32:44 +01:00
Ulf Gebhardt	c11ef2fbbb	admin_area language file	2021-11-24 19:32:44 +01:00
elweyn	fe22bee016	Changed locales to give some textes.	2021-11-24 09:05:15 +01:00
Ulf Gebhardt	0c8e79bc74	cleanup ResetPassword & deleted unused queries	2021-11-24 03:57:07 +01:00
Ulf Gebhardt	30079e2039	fix createUser call	2021-11-24 03:56:42 +01:00
Ulf Gebhardt	04d3804326	remove CheckEMail component to unify it under ResetPassword	2021-11-24 03:56:04 +01:00
Ulf Gebhardt	6e7e4c374a	frontend lint	2021-11-24 02:11:56 +01:00
Ulf Gebhardt	636c4c8df3	implement verifyLogin	2021-11-23 14:05:02 +01:00
Moriz Wahl	e9ceb7e7a5	test that logout is dispatched when clicked on admin area	2021-11-23 12:48:59 +01:00
Moriz Wahl	599eaf495a	test window location assign	2021-11-23 12:48:59 +01:00
Ulf Gebhardt	c1381da240	test admin link, ... correct pointer class	2021-11-23 12:48:59 +01:00
Ulf Gebhardt	b2bb67ab9c	fix tests	2021-11-23 12:48:59 +01:00
Ulf Gebhardt	024eb30612	fixed locales	2021-11-23 12:48:59 +01:00
Ulf Gebhardt	f21587ae3a	frontend lint	2021-11-23 12:48:59 +01:00
Ulf Gebhardt	41d6a7ba45	implemented isAdmin from backend	2021-11-23 12:48:59 +01:00
Ulf Gebhardt	c3801f37ab	corrected ports	2021-11-23 12:46:16 +01:00
Ulf Gebhardt	35b45f4b3d	todo port & define port due to my setup	2021-11-23 12:46:16 +01:00
Ulf Gebhardt	a82f612be8	separate router.beforeach & implement the authenticate route	2021-11-23 12:46:16 +01:00
Ulf Gebhardt	f8404fc9a9	link to admin if isAdmin is true	2021-11-23 12:45:42 +01:00
Ulf Gebhardt	a1e8114673	admin_area language file	2021-11-23 12:45:42 +01:00
Ulf Gebhardt	d5b2356caf	setPassword in frontend ... remove resetPassword	2021-11-23 12:08:23 +01:00
Ulf Gebhardt	d1dfda81ce	removed password from createUser & implement setPassword	2021-11-23 12:00:14 +01:00
elweyn	7afbc8dc3c	Implemented a switch for reset & checkEmail so that both send to ResetPassword.vue but show different textes.	2021-11-23 09:36:10 +01:00
elweyn	3ce3370e80	Changed the vue test so that we get information of the locale.	2021-11-23 09:35:27 +01:00
elweyn	a9941faafb	Added locale for activate email & reset email.	2021-11-23 09:34:54 +01:00
Ulf Gebhardt	728aaa095f	first of several calls regarding password reset	2021-11-23 03:04:28 +01:00
Hannes Heine	ab0d29bc31	Update frontend/src/views/Pages/Register.vue	2021-11-22 23:50:44 +01:00
Hannes Heine	ed3d9ca422	Merge branch 'master' into 1002-language-selection-register-store	2021-11-22 23:49:52 +01:00
Ulf Gebhardt	73c9f7c2ab	Merge branch 'master' into bugfix_registration	2021-11-22 23:27:58 +01:00
Hannes Heine	6bf0c032e9	Update frontend/src/views/Pages/thx.vue	2021-11-22 23:27:17 +01:00
Hannes Heine	57e01cba27	Update frontend/src/locales/en.json	2021-11-22 23:27:09 +01:00
Hannes Heine	38ee1d46b8	Update frontend/src/locales/de.json	2021-11-22 23:27:02 +01:00
Ulf Gebhardt	68fc7bab1b	Merge branch 'master' into login_call_updateUserInfos	2021-11-17 17:02:35 +01:00
Moriz Wahl	fd994936d5	Update frontend/src/views/Pages/SendOverview/GddSend/QrCode.vue ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2021-11-17 12:58:18 +01:00
Moriz Wahl	259a663f05	test global components	2021-11-16 13:27:52 +01:00
Moriz Wahl	e8859544f7	feat: Raise Test Coverage Frontend	2021-11-16 13:06:53 +01:00
elweyn	9a75604a7a	Change prozess so that a user that has not activate his account gets a warning that he needs to click the activation link in the email. Withdrew sendActivationMail again.	2021-11-12 10:55:43 +01:00
elweyn	1bf8e8451d	Textes for the new pages added.	2021-11-12 10:06:51 +01:00
elweyn	fefcb7251a	Routes can route to /thx/login & /activateEmail , thx page now integrates email not activated logic.	2021-11-12 10:06:31 +01:00
elweyn	b1e419530c	Fix sorting of locale.	2021-11-12 08:31:48 +01:00
elweyn	f5044e8579	Change register message & error toast message account not active yet.	2021-11-12 07:54:14 +01:00