mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 10:22:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,282 Commits 4 Branches 148 Tags 4.3 GiB
59b5b130a6
Commit Graph

6282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christoph Atteneder
6f110342bb
Add tests for arbitration language warning 2018-08-13 12:55:40 +02:00
Christoph Atteneder
b0296e28c4
Show warning if user selects language where native speaking arbitration support is not available 2018-08-13 12:21:45 +02:00
Manfred Karrer
fec12e5fdb
Merge pull request #1620 from ripcurlx/fix-reseting-of-amount-in-trade-statistics 
Properly reset cell in amount column
 2018-08-13 12:03:31 +02:00
Christoph Atteneder
29414133fa
Properly reset cell in amount column 2018-08-13 10:38:07 +02:00
Manfred Karrer
7e1dcba597
Merge branch 'master' into notifications 2018-08-12 16:41:14 +02:00
Manfred Karrer
be5d1917e0
Remove iphone 6 warning 
Background App refresh need to be enabled (wlan+mobile data) and bisq
enabled (settings/general/Background App refresh). If that is not
enabled the app does not receive the messages even if it is open.
Apple has some weird logic who the name such "features" - you need
Background App refresh enabled to receive data if the app is not in
background.... I think another reason to push Apple in background...
 2018-08-11 23:19:34 +02:00
Manfred Karrer
21be6bec81
Cleanup blind vote domain 2018-08-11 22:06:18 +02:00
Manfred Karrer
3bce2b828b
Add adjustment fro multiple ofg 10 EUR for HalCash 
With ATMs one can withdraw only multiples of 10 EUR.
We adjust the input values the way that the EUR amount leads to
multiple of 10. MinAmount and amount will be adjusted.

Please note that a similar approach like implemented here for HalCash
can be used for removing the decimal places from fiat amounts to
improve privacy. We keep that for a follow up PR to not mix 2 different
use cases.
 2018-08-11 20:48:42 +02:00
Manfred Karrer
671daacd18
Add more logs 2018-08-10 23:34:40 +02:00
Manfred Karrer
e7b3629a71
Add HalCash 2018-08-10 22:19:59 +02:00
Manfred Karrer
24991d739a
Change version from -SNAPSHOT to 0.9.0 2018-08-09 14:15:00 +02:00
Manfred Karrer
703bc08e79
Handle no-webcam case 
Fixed https://github.com/bisq-network/bisq-desktop/issues/1618
 2018-08-09 11:18:32 +02:00
Manfred Karrer
6e15721935
Merge pull request #1617 from blur-network/list-blur-asset 
List Blur (BLUR)
 2018-08-09 01:48:55 +02:00
blur-network
62c7a8fd11
List Blur (BLUR) 2018-08-08 19:11:06 -04:00
Manfred Karrer
c180f8767a
Remove BooleanVote and LongVote. 
Make Vote to BooleanVote
 2018-08-09 00:54:44 +02:00
Manfred Karrer
185eee2fcb
Cleanup ballot domain 2018-08-09 00:39:12 +02:00
Manfred Karrer
4fddc5d089
Cleanup proposal domain 2018-08-09 00:17:40 +02:00
Manfred Karrer
5844bd1717
Remove uid from Proposal 
We can use the txId as unique ID
 2018-08-08 23:40:18 +02:00
Manfred Karrer
dde3ba0a67
Cleanup proposal domain 2018-08-08 23:22:06 +02:00
Manfred Karrer
1d10de9b2c
Use DevEnv.logErrorAndThrowIfDevMode 2018-08-08 22:54:54 +02:00
Manfred Karrer
697e7ae058
Improve vote result view 2018-08-08 00:06:36 +02:00