Moriz Wahl
|
23ed8fe4f7
|
Merge pull request #1834 from gradido/fix-decay-rounding-with-transaction-links
fix: Round Decay with Tranasction Links
|
2022-04-25 16:31:13 +02:00 |
|
|
|
99f03817bf
|
Merge branch 'master' into fix-decay-rounding-with-transaction-links
|
2022-04-25 16:20:13 +02:00 |
|
|
|
6edb764c03
|
Merge pull request #1828 from gradido/fix_missing_config_for_redeem_url
Fix: config value for the redeem URL was missing
|
2022-04-25 16:20:00 +02:00 |
|
Moriz Wahl
|
ecbb59281e
|
Merge branch 'master' into fix-decay-rounding-with-transaction-links
|
2022-04-25 16:12:40 +02:00 |
|
|
|
b4bb7fa429
|
Merge branch 'master' into fix_missing_config_for_redeem_url
|
2022-04-25 16:11:08 +02:00 |
|
|
|
189ae1c3a3
|
Merge pull request #1748 from gradido/database_admin_pending_creations_decimal
Refactor: Database admin pending creations use decimal
|
2022-04-25 16:10:49 +02:00 |
|
Moriz Wahl
|
1d48c12573
|
Merge branch 'master' into fix-decay-rounding-with-transaction-links
|
2022-04-25 16:04:38 +02:00 |
|
Moriz Wahl
|
a4ae002693
|
round balance down before subtracting hold available amount
|
2022-04-25 16:01:26 +02:00 |
|
|
|
a4a92812bf
|
adjusted migrtion number to 35
|
2022-04-25 15:14:55 +02:00 |
|
|
|
0299fffbee
|
Merge branch 'master' into database_admin_pending_creations_decimal
# Conflicts:
# backend/src/config/index.ts
|
2022-04-25 15:13:03 +02:00 |
|
Moriz Wahl
|
fef49cafea
|
Merge pull request #1808 from gradido/eliminate-server-user-table
refactor: Drop Server User Table
|
2022-04-25 15:00:56 +02:00 |
|
|
|
e2957e0b34
|
config value for the redeem URL was missing
|
2022-04-25 14:17:45 +02:00 |
|
|
|
e9906f3908
|
Merge branch 'master' into database_admin_pending_creations_decimal
|
2022-04-25 14:08:00 +02:00 |
|
|
|
73fe46c39d
|
also change memo column
|
2022-04-25 14:03:38 +02:00 |
|
Moriz Wahl
|
fdb64071d6
|
join tables to update is_admin
|
2022-04-25 11:32:26 +02:00 |
|
Moriz Wahl
|
fb3137892f
|
Merge branch 'master' into eliminate-server-user-table
|
2022-04-25 11:21:00 +02:00 |
|
Alexander Friedland
|
63e47d0c32
|
Merge pull request #1821 from gradido/1816-Expired-link-are-not-highlighted
1816 expired link are not highlighted
|
2022-04-22 16:13:27 +02:00 |
|
ogerly
|
70a153c67c
|
changed paddings from dropdown menu
|
2022-04-22 16:00:06 +02:00 |
|
Alexander Friedland
|
4b04c0e771
|
Merge branch 'master' into 1816-Expired-link-are-not-highlighted
|
2022-04-22 15:59:28 +02:00 |
|
Alexander Friedland
|
db8a837518
|
Merge pull request #1820 from gradido/1812-Put-QR-Code-into-Popup-on-generate
1812 put qr code into popup on generate
|
2022-04-22 15:58:27 +02:00 |
|
Alexander Friedland
|
53a192c25b
|
Merge branch 'master' into 1816-Expired-link-are-not-highlighted
|
2022-04-22 15:17:17 +02:00 |
|
Alexander Friedland
|
ee4feb5cac
|
Merge branch 'master' into 1812-Put-QR-Code-into-Popup-on-generate
|
2022-04-22 15:16:06 +02:00 |
|
|
|
4de4451ee2
|
Merge pull request #1817 from gradido/federation_image
Docu: Federation image
|
2022-04-22 13:29:39 +02:00 |
|
|
|
d3957ae527
|
Merge branch 'master' into federation_image
|
2022-04-22 13:18:25 +02:00 |
|
Alexander Friedland
|
dde695831a
|
Merge branch 'master' into 1816-Expired-link-are-not-highlighted
|
2022-04-22 13:08:28 +02:00 |
|
ogerly
|
f8e46cc1e1
|
remove another unused font-scale 1
|
2022-04-22 13:07:39 +02:00 |
|
ogerly
|
432e0c1e71
|
remove unused font-scale 1
|
2022-04-22 13:05:56 +02:00 |
|
Alexander Friedland
|
17ba05eecf
|
Merge pull request #1819 from gradido/1813-QR-Code-Popup
1813 qr code popup
|
2022-04-22 13:02:50 +02:00 |
|
ogerly
|
268289bc70
|
change button color
|
2022-04-22 12:59:55 +02:00 |
|
Alexander Friedland
|
c28b4eabbb
|
Merge branch 'master' into 1813-QR-Code-Popup
|
2022-04-22 12:44:30 +02:00 |
|
ogerly
|
d595c76d08
|
change props from text to link in FigureQrCode
|
2022-04-22 12:43:27 +02:00 |
|
Alexander Friedland
|
3163acabee
|
Merge branch 'master' into 1812-Put-QR-Code-into-Popup-on-generate
|
2022-04-22 12:19:20 +02:00 |
|
clauspeterhuebner
|
7614e768fa
|
Merge pull request #1822 from gradido/fix_windows_cross-env
Fix: cross-env for windows
|
2022-04-22 12:18:44 +02:00 |
|
ogerly
|
0361b99a11
|
fixed test validUntil to string
|
2022-04-22 12:17:43 +02:00 |
|
ogerly
|
f6c64af047
|
resolve conflict unused computed link()
|
2022-04-22 11:59:06 +02:00 |
|
Alexander Friedland
|
8748abf4f0
|
Update frontend/src/components/TransactionLinks/TransactionLink.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-04-22 11:43:30 +02:00 |
|
Alexander Friedland
|
8df93df392
|
Update frontend/src/components/TransactionLinks/TransactionLink.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-04-22 11:42:23 +02:00 |
|
Alexander Friedland
|
e4214bc193
|
Update frontend/src/components/TransactionLinks/TransactionLink.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-04-22 11:41:10 +02:00 |
|
Alexander Friedland
|
720f90f4b2
|
Update frontend/src/components/TransactionLinks/TransactionLink.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-04-22 11:40:40 +02:00 |
|
Alexander Friedland
|
a54ad7cef4
|
Update frontend/src/components/TransactionLinks/TransactionLink.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-04-22 11:40:25 +02:00 |
|
Alexander Friedland
|
df958f0be8
|
Update frontend/src/components/TransactionLinks/TransactionLink.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-04-22 11:38:10 +02:00 |
|
Alexander Friedland
|
158ca4abec
|
Update frontend/src/components/TransactionLinks/TransactionLink.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-04-22 11:37:52 +02:00 |
|
Alexander Friedland
|
17a96a5c6f
|
Merge branch 'master' into 1813-QR-Code-Popup
|
2022-04-22 11:34:04 +02:00 |
|
Alexander Friedland
|
e7147f7dad
|
Merge branch 'master' into 1812-Put-QR-Code-into-Popup-on-generate
|
2022-04-22 11:33:18 +02:00 |
|
Alexander Friedland
|
b7e940e6c1
|
Merge branch 'master' into 1816-Expired-link-are-not-highlighted
|
2022-04-22 11:31:46 +02:00 |
|
Alexander Friedland
|
730a6004d7
|
Merge branch 'master' into fix_windows_cross-env
|
2022-04-22 11:28:26 +02:00 |
|
Moriz Wahl
|
af97673891
|
Merge branch 'master' into federation_image
|
2022-04-22 11:18:41 +02:00 |
|
Moriz Wahl
|
7e4d4bf607
|
Merge branch 'master' into eliminate-server-user-table
|
2022-04-22 11:18:00 +02:00 |
|
Moriz Wahl
|
d7801ba342
|
Merge pull request #1818 from gradido/fix-double-load-transaction-links
fix: Double Load Transaction Links
|
2022-04-22 11:17:39 +02:00 |
|
Claus-Peter Hübner
|
7d1f97ea0b
|
cross-env for database
|
2022-04-22 02:34:17 +02:00 |
|
