4233 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
ogerly	435489223f	First steps apollo getUsers query.	2021-11-23 12:25:54 +01:00
ogerly	05c9449e0e	yarn lint fix	2021-11-23 12:16:46 +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
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
Hannes Heine	6fcce8bf57	Merge pull request #1113 from gradido/1002-language-selection-register-store ... Stale: 1002-language-selection-register	2021-11-23 00:38:07 +01:00
Hannes Heine	3c69ab15c7	Merge branch 'master' into 1002-language-selection-register-store	2021-11-23 00:10:02 +01:00
Hannes Heine	13022a9097	Merge pull request #1120 from gradido/bugfix_coinanimation_update_only_send_for_true ... Error for removing coin animation	2021-11-23 00:09:45 +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	635c7b6e51	Merge branch 'master' into bugfix_coinanimation_update_only_send_for_true	2021-11-22 23:48:53 +01:00
Hannes Heine	9297dc9f5a	Merge pull request #1099 from gradido/bugfix_registration ... Adding a check that the user is activated before letting them login.	2021-11-22 23:47:21 +01:00
Hannes Heine	ed01bca12b	Update backend/src/graphql/resolver/UserResolver.ts	2021-11-22 23:35:02 +01:00
Hannes Heine	49db3d37fc	Update backend/src/typeorm/repository/UserSettingRepository.ts	2021-11-22 23:33:04 +01:00
Ulf Gebhardt	73c9f7c2ab	Merge branch 'master' into bugfix_registration	2021-11-22 23:27:58 +01:00
Hannes Heine	e922a4895c	Merge pull request #1128 from gradido/bugfix_transactions_alterAutoIncrAfterRollback ... Changed the Auto increment so that it is done after the rollback and …	2021-11-22 23:27:46 +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
elweyn	fccc7b4434	Changed the Auto increment so that it is done after the rollback and not in the finally block.	2021-11-22 23:17:11 +01:00
Hannes Heine	c863501029	Merge pull request #1095 from gradido/login_call_unsecureLogin ... Login call unsecure login	2021-11-22 22:40:28 +01:00
Ulf Gebhardt	6dab777005	use correct pubKey, use hex instead of buffer	2021-11-22 22:00:57 +01:00
Hannes Heine	1d9042ca4b	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2021-11-22 21:42:09 +01:00
Ulf Gebhardt	82ea3dc11a	Merge branch 'master' into login_call_unsecureLogin	2021-11-22 16:26:08 +01:00
Moriz Wahl	4fc0af06c0	Merge pull request #1045 from gradido/setup-admin-interface ... feat: Setup Admin Interface	2021-11-22 16:25:51 +01:00
Ulf Gebhardt	0fd2110fa1	removed duplicate import	2021-11-22 16:06:48 +01:00