7037 Commits

Author SHA1 Message Date
elweyn
ac3340ec1c Change RESEND_TIME config name to EMAIL_CODE_VALID_TIME. 2022-03-14 12:49:34 +01:00
elweyn
c975ac0aa2 Add apollo query mock to the ResetPassword.spec.js so that the success case is taken in account, TODO: Test for error case. 2022-03-14 12:42:18 +01:00
elweyn
00a1ed9e11 Merge branch '1319-email-optin' of https://github.com/gradido/gradido into 1319-email-optin 2022-03-14 12:34:13 +01:00
elweyn
21504e8005 Add query to the queries file, add method that checks if optin code is valid else push to password reset page. 2022-03-14 12:33:57 +01:00
elweyn
4105191b04 RIGHTS for the query. 2022-03-14 12:33:10 +01:00
elweyn
c3f7953bdb Create a query to check if OptIn code is not to old. 2022-03-14 12:32:42 +01:00
Hannes Heine
2b9214316c
Merge branch 'master' into 1319-email-optin 2022-03-14 11:35:30 +01:00
Alexander Friedland
93e70c0aac
Merge pull request #1600 from gradido/1599-components-for-transactionlist-types
1599 components for transactionlist types
2022-03-11 17:30:10 +01:00
Alexander Friedland
13fc659f1f
Merge branch 'master' into 1599-components-for-transactionlist-types 2022-03-11 17:21:53 +01:00
ogerly
1d366bcb5d change review from ulf 2022-03-11 17:21:37 +01:00
Moriz Wahl
f127bb289b
Merge pull request #1610 from gradido/link-transaction-to-transaction-link
feat: Link Transaction to Transaction Link on Redeem
2022-03-11 17:10:05 +01:00
Moriz Wahl
470cb368bf add AFTER statement to sql 2022-03-11 16:50:36 +01:00
Alexander Friedland
5238a0a5d6
Merge branch 'master' into 1599-components-for-transactionlist-types 2022-03-11 16:37:12 +01:00
Moriz Wahl
e79a583ee2 insert transactionLinkId in transaction made by redeemed link, update transaction link within commit transaction 2022-03-11 16:29:54 +01:00
ogerly
7cb2b1ece2 test GddTransactionList.spec.js pagenation 2022-03-11 16:12:49 +01:00
Moriz Wahl
06d45c1e51 add transaction link id to transaction model 2022-03-11 16:12:13 +01:00
Moriz Wahl
e7554030b8 add transactionLinkId to transaction entity 2022-03-11 16:01:35 +01:00
Moriz Wahl
6d284c8170 new DB version 2022-03-11 15:58:16 +01:00
ogerly
ef4bbbdb26 yarn lint --fix 2022-03-11 15:57:09 +01:00
Moriz Wahl
b3f7fd28a1 add transactionLinkId Column to transactions table 2022-03-11 15:54:59 +01:00
Moriz Wahl
b5ef464222
Merge pull request #1607 from gradido/redeem-transaction-link-mutation
feat: Redeem Transaction Link Mutation
2022-03-11 15:46:48 +01:00
Moriz Wahl
826ad7019c add TODO 2022-03-11 15:33:36 +01:00
Moriz Wahl
13c61984de liniting 2022-03-11 15:27:02 +01:00
Moriz Wahl
df7406b145 Merge branch 'master' into redeem-transaction-link-mutation 2022-03-11 15:25:24 +01:00
Moriz Wahl
13fe4300d2 extract transaction process in function 2022-03-11 15:19:01 +01:00
Moriz Wahl
b5a771b27f
Merge pull request #1606 from gradido/transaction-link-list-query
feat: List Transaction Links Query
2022-03-11 14:50:00 +01:00
Moriz Wahl
5d21c25240 also list depricated links 2022-03-11 14:39:12 +01:00
Moriz Wahl
0267a31515 use paginated for args 2022-03-11 14:19:48 +01:00
Moriz Wahl
7c104fc705 Merge branch 'master' into transaction-link-list-query 2022-03-11 14:13:46 +01:00
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
9912c8913b prevent linter 2022-03-11 14:10:31 +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
489ab233b9 define type of arg offset 2022-03-11 13:59:33 +01:00
Moriz Wahl
d46cb9a63c
Merge branch 'master' into transaction-link-list-query 2022-03-11 13:51:22 +01:00
Moriz Wahl
81cd858eb4 call transaction resolver to redeem transactoin link. Optional senderId parameter for sendCoins to redeem links 2022-03-11 13:47: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
e97c05d832
Merge branch 'master' into refactor-transaction-link-query 2022-03-11 13:13:42 +01:00
Alexander Friedland
f22815cdc4
Merge branch 'master' into 1599-components-for-transactionlist-types 2022-03-11 13:13:14 +01:00
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
1831ff095c
Merge branch 'master' into 1599-components-for-transactionlist-types 2022-03-11 13:07:11 +01:00
Moriz Wahl
ae3d20e57a
Merge branch 'master' into transaction-link-list-query 2022-03-11 13:02:00 +01:00
elweyn
08dd7c3518 Remove the defaultValue, stored email, etc... 2022-03-11 12:54:08 +01:00
Alexander Friedland
359919fece
Merge branch 'master' into 1216-SEO-Vorschau-Links 2022-03-11 12:53:35 +01:00
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
Moriz Wahl
fed268afb6 tpye number for offset arg 2022-03-11 12:44:55 +01:00
Moriz Wahl
cda9ee196d tpye number for offset arg 2022-03-11 12:44:32 +01:00
Moriz Wahl
277d0a4b38 set rights 2022-03-11 12:41:13 +01:00