4254 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	fa717e7046	Merge branch 'master' into ADMINBEREICH-first-step	2021-11-24 18:03:38 +01:00
Moriz Wahl	ff20a223b9	coverage for unit tests admin interface to 47%	2021-11-24 18:02:29 +01:00
Moriz Wahl	7d39797a3e	test router	2021-11-24 17:58:42 +01:00
Moriz Wahl	b3580184f5	test creation confirm	2021-11-24 17:44:59 +01:00
Moriz Wahl	fb7868344a	test user search	2021-11-24 17:29:53 +01:00
Moriz Wahl	7a944306b9	Icon in test setup, test for Creation	2021-11-24 11:59:54 +01:00
Ulf Gebhardt	63a0d7b0cf	Merge pull request #1112 from gradido/login_hook_elopage ... Login hook elopage	2021-11-24 11:34:33 +01:00
Ulf Gebhardt	518209d2a3	reduce coverage	2021-11-24 11:23:51 +01:00
Moriz Wahl	fdc1c0bf88	more tests for CreationFormular. Fix update for properties	2021-11-24 11:16:36 +01:00
Moriz Wahl	50e1a16f83	test store	2021-11-24 10:28:57 +01:00
Moriz Wahl	c98d615105	ignore assets for test coverage	2021-11-24 10:22:09 +01:00
Moriz Wahl	43f673bd82	test i18n	2021-11-24 10:18:48 +01:00
Moriz Wahl	5c73c9ae69	rename footer to content-footer and simple test App.vue	2021-11-24 09:52:31 +01:00
Moriz Wahl	e856c326eb	fix linebreaks	2021-11-24 09:24:27 +01:00
Ulf Gebhardt	87059a6588	Merge branch 'master' into login_hook_elopage	2021-11-24 09:08:14 +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
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
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
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
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
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