7991 Commits

Author SHA1 Message Date
ogerly
f30be03c5b folder for new style images 2022-03-30 16:57:13 +02:00
Moriz Wahl
fda507c54c add balance to transaction objects created for pagination tests 2022-03-30 16:08:36 +02:00
Moriz Wahl
19a26d5fb7 add required prop previous booked balance tp specs 2022-03-30 16:02:57 +02:00
Moriz Wahl
ef17acc72d add previous booked balance prop to all transaction types, rename components 2022-03-30 15:58:59 +02:00
Moriz Wahl
0ab4f73f3b subtract the hold available amount from last transaction balance for virtual decay transaction 2022-03-30 15:10:36 +02:00
Moriz Wahl
dc09a0ccf6 get balance of previous transaction to avoid decay calculation 2022-03-30 15:03:54 +02:00
Moriz Wahl
20a1c08c05
Merge branch 'master' into update-deployment-env 2022-03-30 14:19:01 +02:00
Moriz Wahl
6449924e80 fix: No plus before zero decay 2022-03-30 14:13:35 +02:00
Moriz Wahl
1902bb9864 add email configs 2022-03-30 14:00:16 +02:00
Moriz Wahl
5b10a87071 update env template 2022-03-30 13:59:55 +02:00
Moriz Wahl
6cc710b62c default publisher id in env template 2022-03-30 13:51:25 +02:00
Alexander Friedland
9ce0229345
Merge pull request #1687 from gradido/1684-when-generating-a-link-form-does-not-reset
1684 when generating a link form does not reset
2022-03-30 10:11:02 +02:00
ogerly
40c7f96b20 remove onReset in created, add EMPTY_TRANSACTION_DATA in send function 2022-03-30 08:07:32 +02:00
ogerly
d013bd9de1 set function onReset on created components for clear form 2022-03-30 08:00:30 +02:00
Alexander Friedland
8a3964b839
Merge branch 'master' into 503-Transaction-List-Pagination-Pages-clickable 2022-03-29 21:16:50 +02:00
Alexander Friedland
0d5c61225a
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list 2022-03-29 21:16:26 +02:00
902d45e8d2
Merge pull request #1679 from gradido/mass_creation_do_not_show_unactivated
Refactor: Multicreation - do not show unactivated emails
2022-03-29 20:39:30 +02:00
10ae00dba8
Merge branch 'master' into mass_creation_do_not_show_unactivated 2022-03-29 20:31:05 +02:00
Moriz Wahl
eeb5af9249
Merge pull request #1663 from gradido/show-valid-time-of-link-in-email
feat: Show Link Duration in Emails
2022-03-29 20:30:55 +02:00
Moriz Wahl
1db61b3efd
Merge branch 'master' into show-valid-time-of-link-in-email 2022-03-29 20:22:20 +02:00
Moriz Wahl
5608937d75
Merge pull request #1665 from gradido/refactor-balance-resolver
refactor: Balance Resolver
2022-03-29 20:22:08 +02:00
Moriz Wahl
07ad22b71d change function name to print time duration 2022-03-29 20:10:00 +02:00
Moriz Wahl
a38a7889a3
Merge branch 'master' into refactor-balance-resolver 2022-03-29 19:59:12 +02:00
Moriz Wahl
abd58ab9cf new config version 2022-03-29 19:58:12 +02:00
Moriz Wahl
8d1eff0765 new config version 2022-03-29 19:57:52 +02:00
Moriz Wahl
a4b30b385f
Merge branch 'master' into show-valid-time-of-link-in-email 2022-03-29 19:49:24 +02:00
Moriz Wahl
4139a931a3
Merge pull request #1662 from gradido/optin-valid-time
refactor: Set Email Optin Valid Time to 24 hours
2022-03-29 19:49:09 +02:00
Moriz Wahl
b3002027cd new backend version in env dist 2022-03-29 19:38:12 +02:00
Moriz Wahl
43242c98b4
Merge branch 'master' into refactor-balance-resolver 2022-03-29 16:15:33 +02:00
Moriz Wahl
90e6798a7d rename context.count to context.transactionCount 2022-03-29 16:10:06 +02:00
Moriz Wahl
0c5719140d Merge branch 'master' into optin-valid-time 2022-03-29 16:05:56 +02:00
1cdb526669
fixed test to properly check the filters on Admin UserSearch 2022-03-29 12:50:13 +02:00
d95e4d864a
Merge branch 'master' into mass_creation_do_not_show_unactivated 2022-03-29 12:43:13 +02:00
a5d485ee41
Merge pull request #1683 from gradido/fixes_stage1
Fix: Fixes found on Stage1
2022-03-29 12:27:02 +02:00
Alexander Friedland
6c953af2f3
Merge branch 'master' into 503-Transaction-List-Pagination-Pages-clickable 2022-03-29 11:48:47 +02:00
Alexander Friedland
b2af0f2429
Update frontend/src/components/GdtTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:48:38 +02:00
Alexander Friedland
a6396cc998
Update frontend/src/components/GdtTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:48:27 +02:00
Alexander Friedland
1ad41ddac8
Update frontend/src/components/GddTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:47:07 +02:00
Alexander Friedland
f6d12c2b46
Update frontend/src/components/GddTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:46:52 +02:00
Alexander Friedland
f4813468de
Update frontend/src/components/GddTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:46:41 +02:00
Alexander Friedland
da9b5f0bbb
Update frontend/src/components/GdtTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:46:28 +02:00
Alexander Friedland
ea825bc6cd
Update frontend/src/components/GdtTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:46:07 +02:00
Alexander Friedland
6e8ef54858
Update frontend/src/components/GdtTransactionList.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:45:50 +02:00
e5cdb3d7b1
Merge branch 'master' into fixes_stage1 2022-03-29 11:43:21 +02:00
Alexander Friedland
9264a6eb2b
Merge pull request #1656 from gradido/1555-Admin-see-user-generated-link
1555 admin see user generated link
2022-03-29 09:00:36 +02:00
Moriz Wahl
667b964d37 coverage backend to 55% 2022-03-29 02:59:25 +02:00
Moriz Wahl
8fd93ff853 remove test for remove optin from DB after email verification 2022-03-29 02:58:36 +02:00
Moriz Wahl
633eef7c16 round GDD values in balance object 2022-03-29 02:34:13 +02:00
Moriz Wahl
feb89cf4e0 import transaction as db transaction 2022-03-29 01:58:20 +02:00
Moriz Wahl
51258b838e set rights correctly 2022-03-29 01:55:59 +02:00