7983 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ogerly	435489223f	First steps apollo getUsers query.	2021-11-23 12:25:54 +01:00
Ulf Gebhardt	1fc0fa3bc1	remove some more comments	2021-11-23 12:24:08 +01:00
Moriz Wahl	0e101a012d	test that logout is dispatched when clicked on admin area	2021-11-23 12:21:47 +01:00
Ulf Gebhardt	4b5acedea2	klicktipp, ... removed unused stuff	2021-11-23 12:20:36 +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
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
Moriz Wahl	5e3e139a23	Merge branch 'master' into add-model-entities	2021-11-23 11:50:08 +01:00
Moriz Wahl	8f066595fc	factory for login user backup	2021-11-23 11:49:06 +01:00
Moriz Wahl	a518ed5096	factory for server user	2021-11-23 11:35:03 +01:00
Ulf Gebhardt	a1a24d1553	prototype setPassword call	2021-11-23 11:24:42 +01:00
Moriz Wahl	535c0b0438	no eslint warnings	2021-11-23 11:21:41 +01:00
ogerly	1697c69e8c	WiP getUsers for Admin.	2021-11-23 11:20:50 +01:00
Moriz Wahl	d4883928f9	factory for login user	2021-11-23 11:17:03 +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	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
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
Ulf Gebhardt	bead60ac7f	use correct constants for email optins	2021-11-23 03:10:34 +01:00
Ulf Gebhardt	1802dbf06d	use correct optin for register	2021-11-23 03:08:43 +01:00
Ulf Gebhardt	87714f0089	corrected error typo	2021-11-23 03:05:29 +01:00
Ulf Gebhardt	728aaa095f	first of several calls regarding password reset	2021-11-23 03:04:28 +01:00
Hannes Heine	84a2918724	Merge branch 'master' into bugfix_database_downgrade_and_upgrade_again	2021-11-23 00:38:38 +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	c8b3afd67d	Merge branch 'master' into bugfix_database_downgrade_and_upgrade_again	2021-11-22 23:44:26 +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
Moriz Wahl	2af825b2ca	Merge branch 'add-model-entities' into setup-seeding	2021-11-22 19:16:06 +01:00