6960 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	e28b3f0bb5	Merge pull request #1603 from gradido/virtual-link-transaction ... feat: Virtual Transaction for Transaction Links	2022-03-11 14:11:04 +01:00
Moriz Wahl	b54278a080	Merge branch 'master' into virtual-link-transaction	2022-03-11 14:01:42 +01:00
Moriz Wahl	4affd35a44	Update backend/src/graphql/resolver/TransactionResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-11 14:01:35 +01:00
Moriz Wahl	e78337d9ef	Update backend/src/graphql/enum/TransactionTypeId.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-11 14:01:04 +01:00
Moriz Wahl	3125031faf	Merge pull request #1605 from gradido/refactor-transaction-link-query ... refactor: Transaction Link Query	2022-03-11 13:30:58 +01:00
Ulf Gebhardt	e97c05d832	Merge branch 'master' into refactor-transaction-link-query	2022-03-11 13:13:42 +01:00
Ulf Gebhardt	c042df8714	remove one unnecessary conditional check	2022-03-11 13:12:44 +01:00
Alexander Friedland	995fcf9f07	Merge pull request #1426 from gradido/1216-SEO-Vorschau-Links ... 1216 seo vorschau links	2022-03-11 13:12:14 +01:00
Alexander Friedland	359919fece	Merge branch 'master' into 1216-SEO-Vorschau-Links	2022-03-11 12:53:35 +01:00
Ulf Gebhardt	a50016c481	Merge pull request #1598 from gradido/eslint_style_rules ... Feature: Eslint style rules & Stylelint for SCSS	2022-03-11 12:49:20 +01:00
Ulf Gebhardt	8cfa01f6bf	Merge branch 'master' into eslint_style_rules	2022-03-11 12:36:38 +01:00
Moriz Wahl	d62862fab8	Merge branch 'master' into virtual-link-transaction	2022-03-11 11:59:43 +01:00
Moriz Wahl	428e29f5d9	refactor: Transaction Link Query	2022-03-11 11:55:06 +01:00
Moriz Wahl	6badb058cb	Merge pull request #1602 from gradido/remove-showEmail ... refactor: Remove showEmail from Transaction Links	2022-03-11 11:33:35 +01:00
Moriz Wahl	7f9745c7a4	Merge branch 'master' into remove-showEmail	2022-03-11 11:22:32 +01:00
Moriz Wahl	f7b6aabfc9	Merge pull request #1597 from gradido/delete-transaction-link-mutation ... feat: Delete Transaction Link Mutation	2022-03-11 11:22:09 +01:00
Moriz Wahl	5300f5db12	Merge branch 'master' into remove-showEmail	2022-03-11 11:15:33 +01:00
Moriz Wahl	50092b0f15	Merge branch 'master' into delete-transaction-link-mutation	2022-03-11 11:14:23 +01:00
Moriz Wahl	e42c91f6e0	rename summary query	2022-03-11 11:07:15 +01:00
Moriz Wahl	80944978ac	only one file for virtual transactions	2022-03-11 10:58:14 +01:00
Moriz Wahl	24a0c2d1e4	no calculation in virtual link transaction	2022-03-11 10:46:24 +01:00
Moriz Wahl	120ce948cd	Update backend/src/graphql/resolver/TransactionResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-11 10:38:37 +01:00
Moriz Wahl	762ad9fe9e	Merge branch 'master' into virtual-link-transaction	2022-03-11 10:36:41 +01:00
Moriz Wahl	df94fa8e37	improved query	2022-03-11 10:21:07 +01:00
Ulf Gebhardt	3aeb59b7fb	Merge branch 'master' into 1216-SEO-Vorschau-Links	2022-03-11 00:12:09 +01:00
Ulf Gebhardt	9a637e1209	Merge branch 'master' into eslint_style_rules	2022-03-11 00:09:52 +01:00
Hannes Heine	797d270b73	Merge pull request #1586 from gradido/query-transaction-link ... Query-transaction-link	2022-03-11 00:03:14 +01:00
Ulf Gebhardt	1f89e8038d	fix tabs in stylelintrc.js	2022-03-11 00:02:54 +01:00
Ulf Gebhardt	333095c927	use correct sass version	2022-03-10 23:54:21 +01:00
elweyn	7e3f86f60e	Remove unused import.	2022-03-10 23:49:28 +01:00
elweyn	bfba633b78	Change the logic to store the redeemer in transactionLink table.	2022-03-10 21:52:49 +01:00
elweyn	a805f65920	Change the logic to a better argument name for redeemUserId.	2022-03-10 21:37:23 +01:00
elweyn	280de3df9e	Add Args for the queryTransactionLink.	2022-03-10 21:36:53 +01:00
elweyn	ade691426e	Add logic for user that redeem the link.	2022-03-10 21:24:42 +01:00
Ulf Gebhardt	1951d834b3	fixed another error, ... remove duplicates	2022-03-10 21:16:24 +01:00
Ulf Gebhardt	30a16fafc4	fixed sass divison	2022-03-10 21:12:55 +01:00
Ulf Gebhardt	227273f22c	custom style defintions	2022-03-10 21:12:42 +01:00
Moriz Wahl	3aa3ead86e	refactor transaction link sum query, add virtual transaction for transaction links to transaction list	2022-03-10 21:06:09 +01:00
Moriz Wahl	923b886baf	create virtual transaction for transaction links	2022-03-10 21:04:36 +01:00
Ulf Gebhardt	5d973a887e	properly use color.adjust	2022-03-10 21:03:58 +01:00
Ulf Gebhardt	735ed77ffb	sass color namespace	2022-03-10 20:55:45 +01:00
Ulf Gebhardt	1761d6380c	use sass map namespace	2022-03-10 20:47:38 +01:00
Ulf Gebhardt	78ac6184de	use sass instead of node-sass	2022-03-10 20:37:28 +01:00
Ulf Gebhardt	30072a3ec5	fix sass file loaded in test	2022-03-10 20:37:15 +01:00
Ulf Gebhardt	f0ab71fc66	Merge branch 'master' into eslint_style_rules	2022-03-10 20:09:38 +01:00
Ulf Gebhardt	8ac00d82ca	fix frontend lint	2022-03-10 20:09:28 +01:00
Ulf Gebhardt	fdab9b0894	admin lint	2022-03-10 19:50:10 +01:00
Ulf Gebhardt	e82306e4bb	stylelint fixes	2022-03-10 19:48:11 +01:00
Moriz Wahl	55455d0236	remove showEmail form model, args and resolver	2022-03-10 18:31:15 +01:00
Moriz Wahl	681f27d4b0	update entity as in master	2022-03-10 18:28:42 +01:00