7801 Commits

Author SHA1 Message Date
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
8cfa01f6bf
Merge branch 'master' into eslint_style_rules 2022-03-11 12:36:38 +01:00
Moriz Wahl
6880fb628e feat: List Transaction Links Query 2022-03-11 12:29:10 +01:00
Moriz Wahl
80201c6fb1 Merge branch 'virtual-link-transaction' into transaction-link-list-query 2022-03-11 12:24:02 +01:00
Moriz Wahl
d62862fab8
Merge branch 'master' into virtual-link-transaction 2022-03-11 11:59:43 +01:00
Alexander Friedland
1f4c987194
Merge branch 'master' into frontend-generate-link-for-send-gdd 2022-03-11 11:58:05 +01:00
Alexander Friedland
1bf2c4a70b
Merge branch 'master' into 1599-components-for-transactionlist-types 2022-03-11 11:57:36 +01:00
Moriz Wahl
428e29f5d9 refactor: Transaction Link Query 2022-03-11 11:55:06 +01:00
ogerly
216a06f40e change icons and colors tested 2022-03-11 11:45:16 +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
elweyn
016f5ef657 Set default unknown email. 2022-03-11 11:12:44 +01:00
Alexander Friedland
bc4450dc8f
Merge branch 'master' into frontend-generate-link-for-send-gdd 2022-03-11 11:09:53 +01:00
Moriz Wahl
e42c91f6e0 rename summary query 2022-03-11 11:07:15 +01:00
elweyn
f206585b67 Change default check of null to unexpected 2022-03-11 10:58:17 +01:00
Moriz Wahl
80944978ac only one file for virtual transactions 2022-03-11 10:58:14 +01:00
elweyn
119f9e9734 Validates immediately so that the defaultValue is checked in the validator. 2022-03-11 10:50:55 +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
ogerly
ebcc73c153 change review from Ulf, rename File Memo.vue to MemoRow.vue, add required on props 2022-03-11 10:34:39 +01:00
Moriz Wahl
df94fa8e37 improved query 2022-03-11 10:21:07 +01:00
elweyn
a4aabfc369 Changes coming from new changes added in here. 2022-03-11 08:45:31 +01:00
elweyn
af3c8a4e36 Resolve merge conflicts. 2022-03-11 08:16:01 +01:00
ogerly
e34654edda change tests for GddTransactionList 2022-03-11 08:13:07 +01:00
d57ed24755
Merge branch 'master' into 1599-components-for-transactionlist-types 2022-03-11 00:22:29 +01:00
3aeb59b7fb
Merge branch 'master' into 1216-SEO-Vorschau-Links 2022-03-11 00:12:09 +01:00
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
1f89e8038d
fix tabs in stylelintrc.js 2022-03-11 00:02:54 +01:00
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
1951d834b3
fixed another error,
remove duplicates
2022-03-10 21:16:24 +01:00
30a16fafc4
fixed sass divison 2022-03-10 21:12:55 +01:00
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
5d973a887e
properly use color.adjust 2022-03-10 21:03:58 +01:00
735ed77ffb
sass color namespace 2022-03-10 20:55:45 +01:00
Alexander Friedland
8802620699
Merge branch 'master' into 1599-components-for-transactionlist-types 2022-03-10 20:51:36 +01:00