mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-25 07:27:18 +01:00
Code Issues Projects Releases Packages Wiki Activity
13243 commits 3 branches 150 tags 4.1 GiB
Commit graph

2216 commits

Author SHA1 Message Date
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
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
db2cda1355
Merge branch 'master' of github.com:bisq-network/bisq into redesign 
# Conflicts:
#	desktop/build.gradle
 2018-10-22 19:27:31 +02:00
Christoph Atteneder
4fe45d3b8b
Remove platform specific libraries in checksum 2018-10-22 18:58:19 +02:00
Christoph Atteneder
01cf2a46cb
Adapt preference view to match design template 2018-10-22 17:47:01 +02:00
Christoph Atteneder
ba2277fcc5
Use top lable with list 2018-10-22 17:46:27 +02:00
Christoph Atteneder
e475147ebe
Use SlideToggleButton 2018-10-22 17:45:44 +02:00
Christoph Atteneder
adae6519f7
Add fixes for not shown combobox selection values 2018-10-22 15:24:15 +02:00
Christoph Atteneder
f9478a5afc
Show error below textinput instead of popup 2018-10-22 11:57:32 +02:00
Christoph Atteneder
6f1e74c780
Remove unnecessary padding to prevent scolling 2018-10-22 10:53:12 +02:00
Christoph Atteneder
549163616e
Display currency name in combobox list also when no offers are available 2018-10-22 10:48:36 +02:00
Christoph Atteneder
ecf8e05889
Remove unused converter 2018-10-22 10:47:56 +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
Christoph Atteneder
4fbf857490
Fix column constraints in PreferencesView 2018-10-19 16:53:30 +02:00
Christoph Atteneder
2df89348e8
Use currency and payment method combobox renderer in OfferBookView 2018-10-19 16:53:01 +02:00
Christoph Atteneder
4f9ff4412a
Use new currency factories 2018-10-19 15:56:53 +02:00
Christoph Atteneder
10f1c795a5
Merge market price and provider 2018-10-19 15:29:46 +02: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
Christoph Atteneder
dc1f59a49e
Adapt new tabs style 2018-10-18 16:35:14 +02:00
Christoph Atteneder
e74ee8ec29
Adapt header to new design 2018-10-18 11:46:21 +02: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
86f39419de
Update scrollbar style 2018-10-17 10:55:50 +02: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
Christoph Atteneder
8cec4df80e
Fix merging error 2018-10-16 19:49:44 +02:00
Christoph Atteneder
29adc6b472
Merge branch 'master' of github.com:bisq-network/bisq into redesign 
# Conflicts:
#	core/src/main/resources/i18n/displayStrings.properties
#	desktop/src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java
#	desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
 2018-10-16 19:38:16 +02:00
Christoph Atteneder
aad26423e5
Replace two column text input with single floating input field 2018-10-16 19:33:01 +02:00
Devin Bileck
d435afdd03
Merge remote-tracking branch 'upstream/master' into fix-take-offer-view 2018-10-16 10:06:11 -07:00
Christoph Atteneder
ad4b52f92a
Adapt ComboBox and CheckBox positioning and layout 2018-10-16 19:01:50 +02: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
fbb5b8e8d2
Use single ComboBox instead of additional label 2018-10-16 14:41:42 +02:00
Christoph Atteneder
0e304f99fe
Merge branch 'master' of github.com:bisq-network/bisq into redesign 2018-10-16 12:17:42 +02: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