5089 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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	ab33753c8e	test admin link, ... correct pointer class	2021-11-22 17:51: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
ogerly	5089152be7	adminbereich, übersicht, usersuche, schöpfen, schöpfung bestätigen	2021-11-22 14:56:30 +01:00
Ulf Gebhardt	573d998533	fix tests	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	b6400d3c8d	fixed locales	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	ced0b06608	add infos about jq software requirement	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	7f501879b1	properly handle auth shortcut in oder to not break layout on logout	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	df74427c39	lint admin	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	7ba1ec8482	frontend lint	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	dbfe882c14	implemented isAdmin from backend	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	e4f77407ee	corrected ports	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	8e8dee1e4a	convenience mode to disable the auth mode for development	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	20eca8ba0d	implement back to wallet or logout in navbar, remove profile thingy	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	c057df54cf	logout page	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	967864d989	todo port & define port due to my setup	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	c5ec31343c	separate router.beforeach & implement the authenticate route	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	82356dceb4	config WALLET_AUTH_URL	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	9e66ea242b	rename views to pages	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	d45048f3df	seperate app and layouts	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	32fe16a03c	refactor routes and route guards	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	393c8000a4	store token is actually set	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	cf89922946	link to admin if isAdmin is true	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	a61317c3af	admin_area language file	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	22c630a848	delete some weird docu stuff	2021-11-20 17:19:58 +01:00
Moriz Wahl	9c02869ea0	fix test CreationFormular	2021-11-19 15:51:29 +01:00
Moriz Wahl	d8dfec9e7f	fix test NavBar	2021-11-19 15:44:09 +01:00
Moriz Wahl	75b31176c7	fix test UserTable	2021-11-19 15:41:01 +01:00
Moriz Wahl	a7735a0468	fix test for main.js	2021-11-19 15:34:04 +01:00
Alexander Friedland	ce04dc903c	Merge branch 'master' into ADMINBEREICH-first-step	2021-11-19 11:18:25 +01:00
ogerly	686f9bfd4e	admin area extended according to concept and functions added and improved. ... workflow stands for the mass creation and for the confirmation of creations. all changes made which were indicated by moritz. all translations will be done in one step at a later date.	2021-11-19 11:17:52 +01:00
Ulf Gebhardt	5cd65190e7	Merge branch 'master' into setup-admin-interface	2021-11-19 02:52:34 +01:00