|
|
2f0da9a97a
|
Merge pull request #1721 from gradido/v1.7.1
v1.7.1
|
2022-04-01 15:12:24 +02:00 |
|
|
|
f76a85baee
|
v1.7.1
|
2022-04-01 15:04:02 +02:00 |
|
Moriz Wahl
|
b3c459c0a4
|
Merge pull request #1720 from gradido/fix-date-display-on-redeem-transaction-link
fix: Localize Dates on Redeem Transaction Link Page
|
2022-04-01 14:58:50 +02:00 |
|
Moriz Wahl
|
f17b8d92f2
|
Merge branch 'master' into fix-date-display-on-redeem-transaction-link
|
2022-04-01 14:49:05 +02:00 |
|
Moriz Wahl
|
2b6a423123
|
Merge pull request #1718 from gradido/round-virtual-transaction-link-transaction
fix: Round Virtual Transaction Link Transaction
|
2022-04-01 14:48:54 +02:00 |
|
Moriz Wahl
|
5e1ddb718b
|
fix tests
|
2022-04-01 14:48:34 +02:00 |
|
Moriz Wahl
|
fe4a6479be
|
Merge branch 'master' into round-virtual-transaction-link-transaction
|
2022-04-01 14:39:53 +02:00 |
|
Moriz Wahl
|
8923cda341
|
fix copy and paste mess
|
2022-04-01 14:35:42 +02:00 |
|
|
|
efac4714d9
|
Merge branch 'master' into fix-date-display-on-redeem-transaction-link
|
2022-04-01 14:35:12 +02:00 |
|
Moriz Wahl
|
efbb8a3bcb
|
localize dates
|
2022-04-01 14:31:14 +02:00 |
|
Alexander Friedland
|
fbc2fe38a3
|
Merge pull request #1719 from gradido/decay-icon-deacy-information
larger icon and deacy information if center
|
2022-04-01 14:23:56 +02:00 |
|
Moriz Wahl
|
cc86a81117
|
round decay values in transaction graphql model
|
2022-04-01 14:13:49 +02:00 |
|
Moriz Wahl
|
ff04cf0cb5
|
do not round in decay model as it is used in utils on creation
|
2022-04-01 14:08:55 +02:00 |
|
Moriz Wahl
|
a32e0a9d43
|
round down decay amount and balance
|
2022-04-01 14:04:01 +02:00 |
|
ogerly
|
35d5555350
|
change cols from 0, 12 / 6, 6 zu 1, 11 / 5, 7
|
2022-04-01 14:03:29 +02:00 |
|
Moriz Wahl
|
15e3aeb7e6
|
round virtual transaction link transaction
|
2022-04-01 13:57:25 +02:00 |
|
ogerly
|
3a33f0bf37
|
icon droplet-half larger end position
|
2022-04-01 13:52:23 +02:00 |
|
|
|
e3bf239132
|
Merge pull request #1717 from gradido/fix_restore
Fix: restore script load correct .env
|
2022-04-01 13:23:31 +02:00 |
|
|
|
cf4299fe72
|
drop database aswell
|
2022-04-01 13:15:11 +02:00 |
|
|
|
f74b84bd30
|
Merge branch 'master' into fix_restore
|
2022-04-01 13:11:23 +02:00 |
|
Alexander Friedland
|
b1b0a8c33b
|
Merge pull request #1716 from gradido/fix-disbled-button-if-totalBalance
fix-disbled-button-if-totalBalance
|
2022-04-01 13:11:17 +02:00 |
|
|
|
bb2e3abbf9
|
load database .env instead of backend .env
|
2022-04-01 13:08:35 +02:00 |
|
ogerly
|
95b49709c7
|
fix-disbled-button-if-totalBalance
|
2022-04-01 12:41:16 +02:00 |
|
Alexander Friedland
|
f0e11c2aba
|
Merge pull request #1713 from gradido/1712-Layouting-droplet
icon droplet-halflarger and correctly positioned
|
2022-04-01 12:21:05 +02:00 |
|
ogerly
|
a8f1c9643d
|
icon droplet-halflarger and correctly positioned
|
2022-04-01 10:23:41 +02:00 |
|
|
|
2baf1ddb28
|
Merge pull request #1709 from gradido/clean-up-registration-flow
fix: Clean up Registration Flow
|
2022-03-31 23:35:09 +02:00 |
|
Moriz Wahl
|
2d09bc3b35
|
Merge branch 'master' into clean-up-registration-flow
|
2022-03-31 23:26:10 +02:00 |
|
Alexander Friedland
|
3ca9adc1ae
|
Merge pull request #1705 from gradido/1703-submit-button-disabled-when-total-amount-to-submit-is-minus
1703 submit button disabled when total amount to submit is minus
|
2022-03-31 23:25:31 +02:00 |
|
Moriz Wahl
|
da9553c1e2
|
Merge branch 'master' into clean-up-registration-flow
|
2022-03-31 23:20:09 +02:00 |
|
Moriz Wahl
|
84ad009969
|
fix tests
|
2022-03-31 23:17:58 +02:00 |
|
Alexander Friedland
|
8f81f922b3
|
Merge branch 'master' into 1703-submit-button-disabled-when-total-amount-to-submit-is-minus
|
2022-03-31 23:14:33 +02:00 |
|
Alexander Friedland
|
90bafd462a
|
Merge pull request #1704 from gradido/1686-When-sending-takes-longer-no-twice-results
add extra disabled variable for send emit, disabled send by emit
|
2022-03-31 23:12:59 +02:00 |
|
Alexander Friedland
|
ecf6721c1e
|
Merge branch 'master' into 1686-When-sending-takes-longer-no-twice-results
|
2022-03-31 23:03:36 +02:00 |
|
Alexander Friedland
|
50b4cf5581
|
Merge branch 'master' into 1703-submit-button-disabled-when-total-amount-to-submit-is-minus
|
2022-03-31 23:03:25 +02:00 |
|
Moriz Wahl
|
72e1d7c3cd
|
no button after registration, fix link if self creator of link, redirect to login instad of redeem
|
2022-03-31 23:01:44 +02:00 |
|
|
|
06e5c93fb5
|
Merge pull request #1699 from gradido/fix_decay
Fix: Correct calculation of decay
|
2022-03-31 23:00:18 +02:00 |
|
Moriz Wahl
|
447fdb6057
|
Merge branch 'master' into fix_decay
|
2022-03-31 22:30:52 +02:00 |
|
Moriz Wahl
|
60e12282a9
|
Merge branch 'master' into fix_decay
|
2022-03-31 22:21:02 +02:00 |
|
|
|
3de023d9ce
|
Merge pull request #1700 from gradido/fix_send_more_then_half_via_link
Fix: Allow sending of more then half of my wealth via link
|
2022-03-31 22:19:43 +02:00 |
|
Alexander Friedland
|
910893ea6c
|
Merge branch 'master' into 1686-When-sending-takes-longer-no-twice-results
|
2022-03-31 22:19:24 +02:00 |
|
Alexander Friedland
|
86f8aa99dc
|
Merge branch 'master' into 1703-submit-button-disabled-when-total-amount-to-submit-is-minus
|
2022-03-31 22:19:02 +02:00 |
|
Moriz Wahl
|
681d34b1dc
|
rounding in virtual decay transaction, pass hold available amount to virtual decay creation
|
2022-03-31 22:17:36 +02:00 |
|
Moriz Wahl
|
cbd7cc6ab9
|
Merge branch 'master' into fix_send_more_then_half_via_link
|
2022-03-31 21:54:55 +02:00 |
|
Moriz Wahl
|
a4a91ca18c
|
Merge pull request #1702 from gradido/seed-creations-in-past
feat: Seed Creations Months Ago From Now
|
2022-03-31 21:54:04 +02:00 |
|
|
|
3ef0074d33
|
free not only the link value but also the decay amount withheld
|
2022-03-31 21:47:55 +02:00 |
|
Moriz Wahl
|
a8c476e4e4
|
Merge branch 'master' into seed-creations-in-past
|
2022-03-31 21:45:24 +02:00 |
|
Alexander Friedland
|
23059a9f0a
|
Merge branch 'master' into 1703-submit-button-disabled-when-total-amount-to-submit-is-minus
|
2022-03-31 21:41:56 +02:00 |
|
Alexander Friedland
|
f240c62d83
|
Merge branch 'master' into 1686-When-sending-takes-longer-no-twice-results
|
2022-03-31 21:40:42 +02:00 |
|
|
|
fb7d69025f
|
Merge pull request #1701 from gradido/frontend_send_show_errors_properly
Fix: Frontend show proper error message on failed send
|
2022-03-31 21:40:05 +02:00 |
|
Moriz Wahl
|
d769096276
|
no changes on Confirmation Send in this PR
|
2022-03-31 21:25:47 +02:00 |
|
