4212 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	cf8ca47cc6	check for no password and emailChecked on login	2021-11-24 02:20:22 +01:00
Ulf Gebhardt	d5ea64d9ca	Merge branch 'bugfix_register_with_not_activ_account' into login_call_resetPassword	2021-11-24 02:16:31 +01:00
Ulf Gebhardt	6e7e4c374a	frontend lint	2021-11-24 02:11:56 +01:00
Ulf Gebhardt	80a1e3a3b0	Merge branch 'master' into login_call_resetPassword	2021-11-24 02:08:25 +01:00
Hannes Heine	d72eea7a87	Merge branch 'master' into bugfix_register_with_not_activ_account	2021-11-23 13:47:00 +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
Ulf Gebhardt	e62f3fd6cb	transactions	2021-11-23 12:32:27 +01:00
Ulf Gebhardt	1fc0fa3bc1	remove some more comments	2021-11-23 12:24:08 +01:00
Ulf Gebhardt	4b5acedea2	klicktipp, ... removed unused stuff	2021-11-23 12:20:36 +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
Ulf Gebhardt	a1a24d1553	prototype setPassword call	2021-11-23 11:24:42 +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	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
Moriz Wahl	885a01a1c2	fix data type of activated field	2021-11-22 19:09:38 +01:00
Moriz Wahl	f2523abecc	add server users entity	2021-11-22 19:05: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
Ulf Gebhardt	8eb5c74ba8	encode buffer to hex when decoding the jwt, not everytime we use it	2021-11-22 15:55:57 +01:00
Ulf Gebhardt	0341ae0d13	Merge branch 'master' into login_call_unsecureLogin	2021-11-22 15:54:37 +01:00
Ulf Gebhardt	5cd65190e7	Merge branch 'master' into setup-admin-interface	2021-11-19 02:52:34 +01:00
elweyn	d8def24e0c	Their was an error in the UserResolver due to a check undefined and false would fall out of the update change it to !== undefined.	2021-11-18 10:28:54 +01:00
Ulf Gebhardt	640c5ec88d	Merge pull request #1084 from gradido/login_call_updateUserInfos ... login_call_updateUserInfos	2021-11-18 01:48:24 +01:00
Ulf Gebhardt	68fc7bab1b	Merge branch 'master' into login_call_updateUserInfos	2021-11-17 17:02:35 +01:00
Moriz Wahl	9745433e4c	Merge pull request #1079 from gradido/await-backaned-tests ... fix: Await Resolved Promises in Backend Unit Tests	2021-11-17 14:18:24 +01:00
Moriz Wahl	a528be6a77	Merge branch 'master' into await-backaned-tests	2021-11-17 13:43:27 +01:00
Moriz Wahl	be937680cc	Merge branch 'master' into await-backaned-tests	2021-11-17 13:33:18 +01:00