Commit Graph

152 Commits

Author SHA1 Message Date
Chris Beams
1cdb39ab60
Pull up JesusMcCloud repo to root
Not all subprojects need it, but most do.
2018-11-04 14:28:14 +01:00
Chris Beams
f6a68f8aef
Pull up common JavaCompile config to root 2018-11-04 14:20:55 +01:00
Chris Beams
4e1fa914a2
Pull up common repositories to root build.gradle 2018-11-04 14:20:55 +01:00
Chris Beams
95c8b8ddfa
Pull up application and configuration of java plugin 2018-11-04 14:20:55 +01:00
Chris Beams
3c1c402d40
Remove use of maven plugin
It is no longer necessary to publish Maven metadata about common, core
and other submodules as they are no longer managed as separate libraries
in separate repositories. The only way these modules should be getting
referenced is from within applications in this repository such as
desktop, statsnode, etc. Essentially, we're no longer publishing our
libraries for public consumption.
2018-11-04 13:19:06 +01:00
Chris Beams
d6178f6eea
Remove osdetector plugin from desktop build
This is used only in common/build.gradle and is obsolete here.
2018-11-04 09:44:04 +01:00
Chris Beams
d3d3ea629a
Remove obsolete gradle/wrapper dir
This was a vestige from when desktop was managed as a separate
repository.
2018-11-04 09:34:01 +01:00
Chris Beams
b460894e4d
Refactor gradle-witness plugin location and config
- Move gradle-witness.jar to top level
 - Extract gradle-witness.gradle build file to top level

Moving these files out of the gradle/ dir and the main build file to the
top level of the repository calls them out and makes their presence and
function more obvious. It also removes a lot of noise from the main
build file.
2018-11-04 09:26:57 +01:00
Chris Beams
c344e0d10a
Remove obsolete desktop/settings.gradle
This was vestige from when desktop was managed as a separate repository.
2018-11-04 09:16:37 +01:00
Jeffrey Ko
ee51292d87
add interac e-transfer question/answer validation 2018-10-30 21:53:32 +07:00
Christoph Atteneder
55133ef117
Merge pull request #1822 from ManfredKarrer/add-cash-depoist-warning
Add warning popup for cash deposit
2018-10-29 10:59:30 +01:00
Alexey Zagarin
0b8f6c17e2 Add PromptPay (Thailand)
Closes https://github.com/bisq-network/payment-methods/issues/6.
2018-10-28 20:25:37 +07:00
Manfred Karrer
cc446fb707
Add warning popup for cash deposit 2018-10-26 21:48:41 -05:00
Manfred Karrer
6b0a54bb0e
Add support for reimbursement requests 2018-10-24 12:30:18 -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
0bbafc070b
Use FormBuilder.getIcon instead of AwesomeDude.createIconLabel 2018-10-23 11:58:41 -05:00
Manfred Karrer
7228228dc7
Merge branch 'master' into DAO-UI-hide-details 2018-10-23 11:52:44 -05: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
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
Christoph Atteneder
3f04be9d30
Remove openjfx checksum until implementation for platform specific libraries is finished 2018-10-22 19:57:25 +02:00
Christoph Atteneder
4fe45d3b8b
Remove platform specific libraries in checksum 2018-10-22 18:58:19 +02:00
Christoph Atteneder
c231187daa
Add checksums for new openjfx libraries 2018-10-22 09:42:35 +02:00
Manfred Karrer
7e64cd2348
Update link 2018-10-20 11:30:34 -05:00
Devin Bileck
5ae96b74b1
Remove unnecessary content from build.gradle 2018-10-20 08:25:17 -07:00
Manfred Karrer
168a15b5a1
Add full node mode and rpc data to settings
- Change FULL_DAO_NODE option from boolean to string to be able to detect not set values
- isFullDaoNode, rpcUser and rpcPw can be set in the UI. If prog ars are
available they will overwrite the UI data.
2018-10-19 23:43:07 -05:00
Manfred Karrer
75e0daefbf
Merge branch 'master' into DAO-UI-hide-details 2018-10-19 21:01:53 -05:00
Manfred Karrer
4fd641fd51
Improve UI 2018-10-19 21:00:50 -05:00
Devin Bileck
48c196b5d1
Switch to OpenJDK10 in Gradle builds
Oracle JDK10 is EOL and is no longer available for download.
So switch to OpenJDK10 in Gradle builds.
2018-10-19 15:46:01 -07:00
Manfred Karrer
29ae886ed8
Merge pull request #1778 from ManfredKarrer/Dao-UI-improvements
Persitence of DAO state
2018-10-18 16:15:28 -05:00
Manfred Karrer
b47678d865
Add DAO resync option to preferences 2018-10-17 22:10:40 -05:00
Manfred Karrer
10fcd622e5
Remove BREAK4 2018-10-17 17:45:02 -05:00
Manfred Karrer
4d30fcb46d
Merge branch 'master' into Dao-UI-improvements 2018-10-17 10:59:05 -05:00
Christoph Atteneder
9ce8b215e1
Merge pull request #1775 from devinbileck/fix-take-offer-view
Hide text that is not applicable in take offer view
2018-10-17 10:17:31 +02:00
Manfred Karrer
6d18a9ea78
Rename BsqState to DaoState 2018-10-17 00:13:42 -05:00
Manfred Karrer
a308469ac6
Support for persisted bsqState as resource file
- Move DecryptedBallotsWithMerits list and EvaluatedProposal list to
BsqState

- Use StoreService for handling persistence of snapshots
2018-10-16 23:21:11 -05:00
Devin Bileck
5e27cbb2f6
Fix field visibility for fixed amount offer 2018-10-16 14:52:41 -07:00
Devin Bileck
d435afdd03
Merge remote-tracking branch 'upstream/master' into fix-take-offer-view 2018-10-16 10:06:11 -07:00
Manfred Karrer
ce5a8b4f19
Merge branch 'arbitration-system-improvements' of https://github.com/ManfredKarrer/bisq into ManfredKarrer-arbitration-system-improvements
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java
2018-10-16 11:48:11 -05:00
Manfred Karrer
dc6c25ed81
Merge branch 'master' into arbitration-system-improvements 2018-10-16 11:32:07 -05:00
Christoph Atteneder
05c47ae1d6
Merge pull request #1767 from devinbileck/labels-truncated-with-display-scaling
Workaround for JDK-8199592; text being truncated at certain display scaling levels
2018-10-16 12:16:30 +02:00
Christoph Atteneder
ad5e2329ce
Merge pull request #1774 from devinbileck/fix-preferences-view-combobox-selection
Fix preferences view combobox selection
2018-10-16 12:08:19 +02:00
Christoph Atteneder
866ea007dd
Merge pull request #1771 from devinbileck/fix-arbitrator-language-selection
Fix arbitrator language selection
2018-10-16 12:00:04 +02:00
Devin Bileck
3d3045c4d6
Move when offerAvailabilityBusyAnimation is stopped
Stop the offerAvailabilityBusyAnimation sooner, prior to showing
securityDepositInfo popup, when it is hiding related fields.
2018-10-14 23:39:03 -07:00
Devin Bileck
b0e232097e
Hide text that is not applicable in take offer view
When taking an offer that does not specify an amount range, hide
the "Check if offer is available" text.

Fixes https://github.com/bisq-network/bisq/issues/1742
2018-10-13 22:38:34 -07:00
Devin Bileck
26d03afbb4
Fix currency not sorted when added back to ComboBox
When removing a previously selected fiat or crypto currency, it was
adding it back to the bottom of the combobox rather than alphabetically.
So make sure to sort when adding a currency to the list.
2018-10-13 21:51:20 -07:00
Devin Bileck
933b0b8277
Fix prompt text disappearing after selection
After selecting an option from the combobox, it would no longer
display the prompt text and instead would be blank.

As per the documentation
https://docs.oracle.com/javase/10/docs/api/javafx/scene/control/ComboBoxBase.html#promptTextProperty:
> Prompt text is not displayed in all circumstances, it is dependent
> upon the subclasses of ComboBoxBase to clarify when promptText will be
> shown.

Therefore, use a custom buttonCell on the combo box to display the
prompt text.
2018-10-13 21:43:14 -07:00
Devin Bileck
313971d7d8
Fix combobox selection using arrow keys
Utilize the onHiding event rather than onAction event to prevent the
first option from being added when using arrow keys to navigate the
combobox. This will add the selected option when the combobox is
closing.
2018-10-13 21:37:22 -07:00
Devin Bileck
b1066d8fe1
Fix arbitrator language selection prompt text
After selecting a language from the combobox, it would no longer
display the prompt text and instead would be blank.

As per the documentation
https://docs.oracle.com/javase/10/docs/api/javafx/scene/control/ComboBoxBase.html#promptTextProperty:
> Prompt text is not displayed in all circumstances, it is dependent
> upon the subclasses of ComboBoxBase to clarify when promptText will be
> shown.

Therefore, use a custom buttonCell on the combo box to display the
prompt text.
2018-10-12 23:45:49 -07:00
Devin Bileck
cb42942d86
Fix arbitrator language selection using arrow keys
To prevent the issue mentioned in
https://github.com/bisq-network/bisq/issues/354 where using arrow keys
to navigate the combobox would add the first language, utilize the
onHiding event rather than onAction event. This will add the selected
language when the combobox is closing.
2018-10-12 23:35:37 -07:00