1720 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	19f2686b6e	Merge branch 'master' into 1637-generate-link-backend ... # Conflicts: # frontend/src/components/ClipboardCopy.vue # frontend/src/components/GddSend/TransactionResultLink.vue # frontend/src/components/TransactionLinks/TransactionLink.vue # frontend/src/components/Transactions/TransactionLinkSummary.spec.js	2022-04-21 13:14:52 +02:00
Moriz Wahl	50bddf49e4	fix test for User.isAdmin as nullable date	2022-04-21 11:16:14 +02:00
Moriz Wahl	fa6fbe38c8	User.isAdmin as nullable Date	2022-04-21 11:05:51 +02:00
Wolfgang Huß	0c0bfe1a10	Rename to filterByActivated and filterByDeleted	2022-04-21 10:52:11 +02:00
Wolfgang Huß	621786c91d	Rename after suggestion emailChecked withActivated and deletedAt to withDeleted	2022-04-21 07:54:41 +02:00
Wolfgang Huß	9761b4afa6	Merge branch 'master' of github.com:gradido/gradido into 1685-refactor-notActivated-isDeleted	2022-04-21 07:23:03 +02:00
Moriz Wahl	e3a807ed95	Merge branch 'master' into eliminate-server-user-table	2022-04-20 13:08:43 +02:00
Moriz Wahl	324de93814	update/remove comments	2022-04-20 12:51:34 +02:00
Moriz Wahl	6691be813f	decontruct input	2022-04-20 12:44:21 +02:00
Moriz Wahl	c9701574f3	seed with isAdmin, test user resolver with isAdmin	2022-04-20 11:44:34 +02:00
Moriz Wahl	8ca72beac8	use isAdmin of user to determine user role	2022-04-20 11:30:29 +02:00
Moriz Wahl	64859a71f4	use isAdmin on user to determine if user is admin	2022-04-20 11:27:09 +02:00
Wolfgang Huß	e8aba86430	Rename isDeleted to deletedAt	2022-04-20 08:53:12 +02:00
Wolfgang Huß	03e1624c11	Rename isEmailChecked to emailChecked	2022-04-20 08:48:13 +02:00
Wolfgang Huß	145989e284	Replace notActivated by isEmailChecked	2022-04-19 14:43:25 +02:00
Moriz Wahl	1b0f53ca64	Merge branch 'master' into refactor-balance-model	2022-04-19 11:10:24 +02:00
Moriz Wahl	6d2033abd2	no interface	2022-04-19 08:36:38 +02:00
Wolfgang Huß	8205e88b2f	Comply Ulf's suggestions	2022-04-14 14:19:40 +02:00
Wolfgang Huß	f94dc967c0	Merge branch 'master' of github.com:gradido/gradido into 1734-emails-get-wallet-link ... # Conflicts: # backend/src/graphql/resolver/TransactionResolver.ts	2022-04-13 10:26:49 +02:00
Moriz Wahl	55ff0ee964	add roundedDecay field to Decay Model. This is used to calibrate the decay since the last transaction	2022-04-12 22:52:51 +02:00
Moriz Wahl	0bcf2cbd8c	use interface for decay constructor	2022-04-12 21:43:18 +02:00
Moriz Wahl	a6e7036339	remove unused fields from balance model	2022-04-12 21:34:33 +02:00
Moriz Wahl	263d0ab812	Merge branch 'master' into define-context-object	2022-04-12 19:45:19 +02:00
Moriz Wahl	51a95132c4	Merge branch 'master' into fix-elopage-status	2022-04-12 19:33:51 +02:00
Moriz Wahl	de6421201d	use getUser helper to get moderator form context	2022-04-12 19:04:29 +02:00
Wolfgang Huß	563afcbf2a	Add EMAIL_CLIENT_URI in config ... - Increment config version. - Correct usage of EMAIL_CLIENT_URI.	2022-04-12 15:36:05 +02:00
Wolfgang Huß	ea5589a840	Add wallet link to transaction mail, first approach	2022-04-12 12:18:04 +02:00
Moriz Wahl	902dce6390	Context interface in balance resolver	2022-04-11 16:24:38 +02:00
Moriz Wahl	d7bec83d25	use Context interface in Transaction resolver	2022-04-11 16:22:32 +02:00
Moriz Wahl	6cc8410720	helper function to get user from context	2022-04-11 16:15:57 +02:00
Moriz Wahl	b0606424d4	Context interface in transaction link resolver	2022-04-11 16:08:39 +02:00
Moriz Wahl	71cb56db0e	no unused lint instruction	2022-04-11 16:04:04 +02:00
Moriz Wahl	8900592b90	use Context interface in GDT resolver	2022-04-11 16:03:12 +02:00
Moriz Wahl	e430ceefa3	remove unused lint rule	2022-04-11 15:59:23 +02:00
Moriz Wahl	9a390c11db	use Context interface in admin resolver	2022-04-11 15:57:59 +02:00
Moriz Wahl	4d09123b0e	remove global no explicit any lint rule	2022-04-11 15:55:05 +02:00
Moriz Wahl	e183a9bde0	remove unused modules	2022-04-11 15:53:00 +02:00
Moriz Wahl	97ee572c3a	Merge branch 'fix-elopage-status' into define-context-object	2022-04-11 15:50:52 +02:00
Moriz Wahl	57298a4d3a	use Context interface in user resolver	2022-04-11 15:50:46 +02:00
Moriz Wahl	f57f67846e	reconstruct context object	2022-04-11 14:58:00 +02:00
elweyn	38ee27005f	Merge branch '1637-generate-link-backend' of https://github.com/gradido/gradido into 1637-generate-link-backend	2022-04-08 08:15:13 +02:00
elweyn	6588a636dd	Change the composition of the link from addition to replace.	2022-04-08 08:14:50 +02:00
Hannes Heine	58093e32b9	Merge branch 'master' into 1637-generate-link-backend	2022-04-07 11:06:39 +02:00
elweyn	41b35f2c5e	Add link to the TransactionLink and change code by link in frontend.	2022-04-06 18:45:27 +02:00
Ulf Gebhardt	bccc5d1ddb	backend remove startblock from balance object	2022-04-06 15:22:32 +02:00
Moriz Wahl	37122ee604	Merge branch 'master' into fix-elopage-status	2022-04-06 14:08:51 +02:00
elweyn	ff24798767	Add free line after import.	2022-04-06 11:10:09 +02:00
elweyn	e49892d69c	Changed the value of code so that it get's the configured COMMUNITY_URL and redeem/ from the backend.	2022-04-06 10:56:27 +02:00
Moriz Wahl	69dae586d8	check that recipient user has activated account in send coins	2022-04-05 15:12:36 +02:00
Moriz Wahl	f3948b39be	pass context object to hasElopage query	2022-04-05 14:50:45 +02:00