4440 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	87059a6588	Merge branch 'master' into login_hook_elopage	2021-11-24 09:08:14 +01:00
Ulf Gebhardt	fc054cc2f9	Merge branch 'master' into login_admin_interface	2021-11-24 09:06:56 +01:00
ogerly	8f99a971ae	add usersearch in usertable und masscreation	2021-11-24 09:02:00 +01:00
Ulf Gebhardt	dc1715eea0	Merge branch 'master' into ADMINBEREICH-first-step	2021-11-24 08:50:54 +01:00
Hannes Heine	cd7c70ee9b	Merge pull request #1131 from gradido/bugfix_register_with_not_activ_account ... Since we don't make a request to the login_server we need to catch if…	2021-11-24 05:56:13 +01:00
ogerly	9873ac6eee	add user search in creation.vue	2021-11-23 16:14:24 +01:00
Ulf Gebhardt	636c4c8df3	implement verifyLogin	2021-11-23 14:05:02 +01:00
Hannes Heine	d72eea7a87	Merge branch 'master' into bugfix_register_with_not_activ_account	2021-11-23 13:47:00 +01:00
ogerly	d6e8d0cc6b	unused import KlickTip and Int in type-graphql remove	2021-11-23 13:27:39 +01:00
ogerly	35f297ece8	Vue uses VueApollo to main.	2021-11-23 13:24:09 +01:00
ogerly	52aa7e437e	Added creation to useradmin model, adding call to apollo in backend.	2021-11-23 13:12:11 +01:00
Moriz Wahl	091c5aafc2	Merge pull request #1127 from gradido/add-model-entities ... feat: Add Server Users Entity	2021-11-23 13:08:53 +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	c8d188279f	add infos about jq software requirement	2021-11-23 12:48:59 +01:00
Ulf Gebhardt	47bce06f95	properly handle auth shortcut in oder to not break layout on logout	2021-11-23 12:48:59 +01:00
Ulf Gebhardt	84684fe51f	lint admin	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	03e5df5ece	convenience mode to disable the auth mode for development	2021-11-23 12:46:16 +01:00
Ulf Gebhardt	58a3de8fbb	implement back to wallet or logout in navbar, remove profile thingy	2021-11-23 12:46:16 +01:00
Ulf Gebhardt	7ab55acf5a	logout page	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	762819b63b	config WALLET_AUTH_URL	2021-11-23 12:46:16 +01:00
Ulf Gebhardt	f249f9043c	rename views to pages	2021-11-23 12:46:16 +01:00
Ulf Gebhardt	2ba1466a8d	seperate app and layouts	2021-11-23 12:46:16 +01:00
Ulf Gebhardt	c02028cd55	refactor routes and route guards	2021-11-23 12:46:16 +01:00
Ulf Gebhardt	f1965c4453	store token is actually set	2021-11-23 12:46:15 +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	0eb4bf8732	delete some weird docu stuff	2021-11-23 12:45:42 +01:00
Ulf Gebhardt	9ea1edb010	Merge branch 'master' into login_hook_elopage	2021-11-23 12:43:24 +01:00
ogerly	435489223f	First steps apollo getUsers query.	2021-11-23 12:25:54 +01:00
Moriz Wahl	0e101a012d	test that logout is dispatched when clicked on admin area	2021-11-23 12:21:47 +01:00
ogerly	05c9449e0e	yarn lint fix	2021-11-23 12:16:46 +01:00
Moriz Wahl	14ed1d518a	test window location assign	2021-11-23 12:16:18 +01:00
ogerly	dc1cf1fbcb	Implemented the graphql AdminResolver method getUsers.	2021-11-23 12:15:24 +01:00
ogerly	c9d6b88dd0	Created a UserAdmin model that represents the Users for the Admin area.	2021-11-23 12:14:20 +01:00
ogerly	2e7c35aab6	Implemented a search LoginUser like on firstName, lastName and email.	2021-11-23 12:13:29 +01:00
Moriz Wahl	5e3e139a23	Merge branch 'master' into add-model-entities	2021-11-23 11:50:08 +01:00
ogerly	1697c69e8c	WiP getUsers for Admin.	2021-11-23 11:20:50 +01:00
ogerly	2443973891	app.vue reinstate	2021-11-23 10:33:57 +01:00
Alexander Friedland	d2bfb213a2	Merge branch 'master' into ADMINBEREICH-first-step	2021-11-23 10:24:04 +01:00
ogerly	fd068bcd0f	update creation data	2021-11-23 10:10:06 +01:00
elweyn	8479975425	Since we don't make a request to the login_server we need to catch if user email has been activated.	2021-11-23 08:05:52 +01:00