Manfred Karrer
526a9f5442
Merge branch 'master' into release-candidate-0.9.0
...
# Conflicts:
# desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java
2018-10-30 14:03:12 -05:00
Jeffrey Ko
ee51292d87
add interac e-transfer question/answer validation
2018-10-30 21:53:32 +07:00
Manfred Karrer
5ac35284ef
Fix test
2018-10-27 18:43:50 -05:00
Christoph Atteneder
45060575bd
Merge branch 'master' of github.com:bisq-network/bisq into redesign
...
# Conflicts:
# desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
# desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
# desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
2018-10-24 13:52:49 +02:00
Manfred Karrer
538538ec34
FIx missing arguments in test, Ignore test (JMockit issue)
...
@Christoph Can you have a look why JMockit is not working anymore
in that module? TradesChartsViewModel is null and creates a nullpointer.
Adding RunWith("JMockit") as it was earlier does not work with changed gradle file
with newer JMockit version.
2018-10-23 13:13:36 -05:00
Christoph Atteneder
15aa9c9e30
Updated Components Demo
2018-10-23 18:20:01 +02:00
Christoph Atteneder
ecf8e05889
Remove unused converter
2018-10-22 10:47:56 +02:00
Christoph Atteneder
4f9ff4412a
Use new currency factories
2018-10-19 15:56:53 +02:00
Christoph Atteneder
0edbb1733c
Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign
...
# Conflicts:
# desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
# desktop/src/main/java/bisq/desktop/util/FormBuilder.java
2018-10-16 10:09:37 +02:00
Manfred Karrer
a9e32c0bdd
Move maker classes back to desktop module
2018-09-27 00:16:24 -05:00
Manfred Karrer
c231750900
Move classed from desktop to core
2018-09-26 16:03:42 -05:00
Christoph Atteneder
a22e5d5b2b
Adapt create offer screen
2018-09-24 11:31:41 +02:00
Manfred Karrer
bb20264473
Move classes
2018-09-23 15:35:06 -05:00
Manfred Karrer
920ad2e1b5
Rename network package to nodes
2018-09-23 15:29:09 -05:00
Manfred Karrer
f7d8b35b32
Add model package and move classes
2018-09-23 15:13:42 -05:00
Manfred Karrer
0d86176f4e
Further refactorings: move classes to other packages
2018-09-23 15:09:22 -05:00
Manfred Karrer
16fac73b6d
Further refactorings move classes to other packages
2018-09-23 14:56:46 -05:00
Christoph Atteneder
c6324b4ad6
Add demo class to test customization of components
2018-09-20 12:13:21 +02:00
Christoph Atteneder
4c068af7b3
Use default security provider instead of Bouncy Castle
2018-09-14 16:02:58 +02:00
Christoph Atteneder
64370f7adb
Fix JMockit setup
2018-09-13 10:46:07 +02:00
Christoph Atteneder
8ed7f4218f
Add not working JMockit setup (help wanted)
2018-09-07 14:03:52 +02:00
Christoph Atteneder
e319449186
Make power mock tests Java 10 compatibile
2018-09-07 14:02:22 +02:00
Christoph Atteneder
c1c38a3ceb
Move desktop to subdirectory
2018-09-05 09:50:29 +02:00
