Manfred Karrer
80cb50a717
Remove colons, remove progressbar style in dao phases
2018-10-25 21:16:21 -05:00
Manfred Karrer
2953b989d1
Fix tab navigation issue
2018-10-25 21:14:49 -05:00
Manfred Karrer
fb4c0f5105
Fix merge errors
2018-10-25 20:11:29 -05:00
Manfred Karrer
8912f71392
Merge branch 'ripcurlx-redesign' into release-candidate-0.9.0
2018-10-25 19:59:31 -05:00
Manfred Karrer
6b10cf7072
Merge branch 'redesign' of https://github.com/ripcurlx/bisq-desktop into ripcurlx-redesign
...
# Conflicts:
# desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
# desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java
2018-10-25 19:59:10 -05:00
Manfred Karrer
7969374a4a
Merge branch 'redesign' of https://github.com/ripcurlx/bisq-desktop into ripcurlx-redesign
...
# Conflicts:
# desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
# desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java
2018-10-25 19:59:00 -05:00
Manfred Karrer
3239b401ae
Merge pull request #1817 from devinbileck/update-install-script
...
Refine the unix install script
2018-10-25 19:47:17 -05:00
Christoph Atteneder
543559f0d4
Clean up RevolutForm
2018-10-25 17:04:38 +02:00
Christoph Atteneder
05277f8c5e
Clean up PerfectMoneyForm
2018-10-25 17:01:16 +02:00
Christoph Atteneder
1134ce178c
Clean up BankForm
2018-10-25 16:49:56 +02:00
Christoph Atteneder
c2b593f668
Clean up MoneyGramForm
2018-10-25 14:39:38 +02:00
Christoph Atteneder
dd72b9162e
Clean up MoneyBeamForm
2018-10-25 14:07:21 +02:00
Christoph Atteneder
bedf8454ca
Clean up InteracETransferForm and remove all resource access with additional colon
2018-10-25 14:06:11 +02:00
Christoph Atteneder
a2b39e8a34
Clean up FasterPaymentsForm
2018-10-25 14:01:04 +02:00
Christoph Atteneder
aed3ffeca1
Clean up F2FForm
2018-10-25 13:56:51 +02:00
Christoph Atteneder
25d6df4786
Clean up ChaseQuickPayForm
2018-10-25 13:50:04 +02:00
Christoph Atteneder
c3239f1c74
Show buttons after group
2018-10-25 12:27:56 +02:00
Christoph Atteneder
7e5e9cb588
Use abstract method to apply TradeCurrency
2018-10-25 12:27:36 +02:00
Christoph Atteneder
d9b11ab647
Remove colons in labels
2018-10-25 12:19:00 +02:00
Christoph Atteneder
23ab1c3cfe
Fix wrong column span
2018-10-25 12:11:28 +02:00
Christoph Atteneder
e99d860f16
Clean up CashDeposit Form and all changes related
2018-10-25 12:11:10 +02:00
Christoph Atteneder
d0ed219484
Comment out unused code block
2018-10-25 10:50:26 +02:00
Devin Bileck
eb879ef495
Merge remote-tracking branch 'remotes/upstream/master' into update-install-script
2018-10-24 23:49:46 -07:00
Devin Bileck
f6e6512c9e
Refine unix install script
2018-10-24 23:40:24 -07:00
Manfred Karrer
5113ccc7fc
Merge pull request #1813 from ManfredKarrer/add-reimbursement-proposal
...
Add support for reimbursement requests
2018-10-24 18:29:17 -05:00
sqrrm
7be08fee9c
FIx typo
...
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2018-10-24 18:28:33 -05:00
sqrrm
c463768856
Add comment
...
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2018-10-24 18:28:08 -05:00
Manfred Karrer
6b0a54bb0e
Add support for reimbursement requests
2018-10-24 12:30:18 -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
Christoph Atteneder
1ee8578fdc
Merge pull request #1807 from ManfredKarrer/update-install-script
...
Update install scripts
2018-10-24 10:08:14 +02:00
Christoph Atteneder
431411433b
Merge pull request #1811 from devinbileck/fix-typos
...
Fix typos
2018-10-24 10:05:16 +02:00
Devin Bileck
0e3166f6b9
Merge remote-tracking branch 'upstream/master' into fix-typos
2018-10-23 23:43:13 -07:00
Manfred Karrer
71276b0417
Update install scripts
...
Add not tested script based on what @devinbileck posted in
https://github.com/bisq-network/bisq/issues/1791
2018-10-23 17:43:10 -05:00
Manfred Karrer
fd6681b9a9
Merge pull request #1795 from ManfredKarrer/DAO-UI-hide-details
...
Dao UI improvements
2018-10-23 17:19:56 -05: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
Manfred Karrer
bccecc1f16
FIx missing arguments in test
2018-10-23 12:42:05 -05:00
Manfred Karrer
0bbafc070b
Use FormBuilder.getIcon instead of AwesomeDude.createIconLabel
2018-10-23 11:58:41 -05:00
Manfred Karrer
501050de6f
Add getUnusedBsqAddressAsString method
2018-10-23 11:56:11 -05:00
Manfred Karrer
7228228dc7
Merge branch 'master' into DAO-UI-hide-details
2018-10-23 11:52:44 -05:00
Christoph Atteneder
15aa9c9e30
Updated Components Demo
2018-10-23 18:20:01 +02:00
Christoph Atteneder
62b4b59895
Merge pull request #1805 from ripcurlx/remove-unnecessary-java-module-config
...
Remove java 9 module configuration
2018-10-23 18:17:42 +02:00
Christoph Atteneder
0c01093614
Style main state of account sub views to match design template and refactor GUI stuff on the way
2018-10-23 17:46:56 +02:00
Christoph Atteneder
4974cefb38
Use tabs instead of toggle group in account section
2018-10-23 15:59:50 +02:00
Christoph Atteneder
3dad02e485
Add missing JFoenix library removed during merge
2018-10-23 10:22:01 +02:00
Christoph Atteneder
80544d52f4
Remove module configuration for openjfx libraries as they are not used as Java 9 modules.
2018-10-23 10:15:59 +02:00
Christoph Atteneder
cdaba9d15d
Merge branch 'master' of github.com:bisq-network/bisq into redesign
...
# Conflicts:
# desktop/build.gradle
2018-10-23 09:22:31 +02:00
Manfred Karrer
f8754969e9
Merge pull request #1803 from ManfredKarrer/move-javafx-dep-to-common
...
Move javafx dependencies to common
2018-10-22 17:01:12 -05:00
Manfred Karrer
d80af564ed
Move javafx dependencies to common
...
For the upcoming API work we use java fx classes also in common (PR
is pending), so that is one reason to move that. But there was also an
issue on Linux (travis) as the platform property was not set in the
core gradle build file, but it is already defined in common.
2018-10-22 16:01:02 -05:00
Manfred Karrer
2c26702c14
Merge pull request #1802 from ManfredKarrer/move-javafx-dep-to-core
...
Move javafx dependencies to core
2018-10-22 13:22:43 -05:00
Manfred Karrer
871e776509
Move javafx dependencies to core
...
We use some javafx (Properties,...) classes in core as well, so we need
to have the dependency resolved there already.
2018-10-22 13:17:06 -05:00
