Manfred Karrer
|
98f65621da
|
Merged master
|
2018-08-21 10:39:27 +02:00 |
|
Manfred Karrer
|
4c5498744a
|
Merge pull request #1635 from ManfredKarrer/mk_master
Mirror webcam image at QR code scan view
|
2018-08-20 18:20:58 +02:00 |
|
Manfred Karrer
|
5c3558c1f7
|
Mirror webcam image at QR code scan view
For better usability we mirror the scanned image from the webcam so that
users move the mobile phone to the direction to the webcam by intuition.
|
2018-08-20 17:40:22 +02:00 |
|
Manfred Karrer
|
a2d5aae398
|
Merged master
|
2018-08-20 16:38:33 +02:00 |
|
Manfred Karrer
|
f573284754
|
Merge pull request #1634 from ManfredKarrer/mk_master
Change link to F2F docs page
|
2018-08-20 14:17:09 +02:00 |
|
Manfred Karrer
|
a2f2503b47
|
Update getAdjustedFiatVolume and getAdjustedAmount methods
|
2018-08-19 12:30:04 +02:00 |
|
Manfred Karrer
|
005d330db9
|
Change link to F2F docs page
|
2018-08-17 21:57:45 +02:00 |
|
Manfred Karrer
|
454506aca1
|
Fix proposal list management
|
2018-08-17 13:08:04 +02:00 |
|
Manfred Karrer
|
5952fa2928
|
Merged master
|
2018-08-17 11:22:07 +02:00 |
|
Manfred Karrer
|
1ad0277ce5
|
Merge pull request #1633 from ripcurlx/de-annoy-rounding-fiat-popup
Only show popup on activation of screen
|
2018-08-17 11:18:22 +02:00 |
|
Christoph Atteneder
|
53383fe596
|
Only show popup on activation of screen
|
2018-08-17 07:50:39 +02:00 |
|
Manfred Karrer
|
2ae5787a89
|
Merged
|
2018-08-16 18:18:54 +02:00 |
|
Manfred Karrer
|
2562d2d246
|
Merge pull request #1630 from ripcurlx/dont-show-fiat-rounding-info-when-amout-field-focused
Not show popup on every volume changed when volume textfield is focused
|
2018-08-16 17:06:18 +02:00 |
|
Manfred Karrer
|
2bed2035ca
|
Merge pull request #1631 from ripcurlx/also-update-min-amount-when-focus-out-of-amount-field
Force update of minimum amount field when leaving maximum amount field
|
2018-08-16 17:05:41 +02:00 |
|
Christoph Atteneder
|
5093e5bec4
|
Force update of minimum amount field when leaving maximum amount field
|
2018-08-16 16:04:46 +02:00 |
|
Christoph Atteneder
|
a45db47974
|
Not show popup on every volume changed when volume textfield is focused
|
2018-08-16 15:48:55 +02:00 |
|
Manfred Karrer
|
63acd56b2a
|
Merge pull request #1629 from ripcurlx/add-new-feature-popup-for-rounded-fiat-values
Add rounded fiat value info popup
|
2018-08-16 12:10:44 +02:00 |
|
Christoph Atteneder
|
e0bd79f172
|
Add rounded fiat value info popup
|
2018-08-16 11:32:28 +02:00 |
|
Manfred Karrer
|
45a901977a
|
Merge pull request #1627 from ManfredKarrer/merged-voting
Add DAO code
|
2018-08-15 19:08:38 +02:00 |
|
Manfred Karrer
|
731fe0bd86
|
Merge pull request #1628 from ripcurlx/add-info-icon-for-fiat-rounding
Add info icon for rounding of fiat values
|
2018-08-15 19:07:40 +02:00 |
|
Christoph Atteneder
|
21109d3074
|
Add info icon for rounding of fiat values
|
2018-08-15 18:40:24 +02:00 |
|
Manfred Karrer
|
59b5b130a6
|
Merge branch 'master' into merged-voting
|
2018-08-15 16:39:26 +02:00 |
|
Manfred Karrer
|
67e99a1eb3
|
Merge branch 'master' of https://github.com/bisq-network/bisq-desktop
|
2018-08-15 16:38:48 +02:00 |
|
Manfred Karrer
|
9f02ec5c7b
|
Merge pull request #1626 from ripcurlx/fix-tests
Fix tests
|
2018-08-15 16:38:07 +02:00 |
|
Manfred Karrer
|
7cdda97155
|
Merge branch 'master' into merged-voting
|
2018-08-15 16:27:09 +02:00 |
|
Manfred Karrer
|
814ade4f1c
|
Merged
|
2018-08-15 16:24:41 +02:00 |
|
Christoph Atteneder
|
c2cbf1ca6e
|
Add mock for newly added trade limit check
|
2018-08-15 16:15:01 +02:00 |
|
Christoph Atteneder
|
4f4d1b9d79
|
Fix test as no decimal fiat values are displayed anymore
|
2018-08-15 16:14:37 +02:00 |
|
Manfred Karrer
|
0c2f582862
|
Merge pull request #1625 from ripcurlx/fix-double-colon-usage
Fix double colon usage
|
2018-08-15 15:39:01 +02:00 |
|
Manfred Karrer
|
276d526e18
|
Merge pull request #1624 from ManfredKarrer/notifications
Add mobile notifications
|
2018-08-15 15:38:42 +02:00 |
|
Manfred Karrer
|
6499772580
|
Fix version number
|
2018-08-15 15:30:05 +02:00 |
|
Christoph Atteneder
|
a85f8de5a8
|
Fix double colon usage
|
2018-08-15 15:12:31 +02:00 |
|
Manfred Karrer
|
c03f4c18ae
|
Merge branch 'master' into notifications
|
2018-08-15 14:40:07 +02:00 |
|
Manfred Karrer
|
a1cfe72c46
|
Merge pull request #1623 from ManfredKarrer/round-trade-volume
Round fiat volume
|
2018-08-15 14:34:53 +02:00 |
|
Manfred Karrer
|
13b8dd71e2
|
Only apply rounding if minAmount is lower as amount
|
2018-08-15 12:12:20 +02:00 |
|
Manfred Karrer
|
76cc2c8b05
|
Merge branch 'master' into voting
# Conflicts:
# src/main/resources/i18n/displayStrings.properties
Merge branch 'master' into voting
# Conflicts:
# build.gradle
|
2018-08-15 00:14:22 +02:00 |
|
Manfred Karrer
|
7eba9f6b3b
|
Merge branch 'voting'
|
2018-08-14 23:59:31 +02:00 |
|
Manfred Karrer
|
87305eb747
|
Merge branch 'master' into voting
# Conflicts:
# src/main/resources/i18n/displayStrings.properties
Merge branch 'master' into voting
# Conflicts:
# build.gradle
|
2018-08-14 23:29:02 +02:00 |
|
Manfred Karrer
|
f77eb4345f
|
Merge branch 'master' into voting
# Conflicts:
# src/main/resources/i18n/displayStrings.properties
Merge branch 'master' into voting
# Conflicts:
# build.gradle
|
2018-08-14 23:27:49 +02:00 |
|
Manfred Karrer
|
c1a4809427
|
Round fiat volume
|
2018-08-14 23:13:46 +02:00 |
|
Manfred Karrer
|
5de04cee2b
|
Merge pull request #1619 from ManfredKarrer/halcash
Add HalCash
|
2018-08-14 20:46:55 +02:00 |
|
Manfred Karrer
|
49cad5ecfa
|
Add check fro trade limit and adjust if needed
|
2018-08-14 20:46:14 +02:00 |
|
Manfred Karrer
|
de54e0dea2
|
Merge branch 'master' into halcash
|
2018-08-14 19:53:10 +02:00 |
|
Manfred Karrer
|
a1ab89acb3
|
Adjust amount in case of edit offer
|
2018-08-14 19:00:43 +02:00 |
|
Manfred Karrer
|
a8b5b1e1d8
|
Add download link. Filter own offers
|
2018-08-14 18:27:50 +02:00 |
|
Manfred Karrer
|
bbc1306143
|
Add market price alerts
|
2018-08-14 14:49:35 +02:00 |
|
Manfred Karrer
|
c88da45244
|
Merge pull request #1621 from ripcurlx/add-non-english-locale-warning
Add warning for languages not natively supported by arbitration
|
2018-08-14 13:52:06 +02:00 |
|
Christoph Atteneder
|
76cc2d55a0
|
Add warning if Offer is taken or created and user has set language that is not supported natively by arbitrators
|
2018-08-14 13:29:06 +02:00 |
|
Christoph Atteneder
|
686ab45253
|
Extract arbitrator language check into ArbitratorManager
|
2018-08-14 12:06:07 +02:00 |
|
Manfred Karrer
|
c3e7fe0e41
|
Improve price alerts
|
2018-08-13 17:44:35 +02:00 |
|