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
7033 commits 3 branches 150 tags 4.1 GiB
Commit graph

7033 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
861d8143ac
Add comment to clarify usage of buildscript block 2018-10-20 08:45:08 -07: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
cff51d5e49
Update README 2018-10-19 16:10:06 -07:00
Devin Bileck
2be4d3d8aa
Add mainClassName to common/build.gradle 
Fix the following error:
  A problem was found with the configuration of task ':common:startScripts'.
  > No value has been specified for property 'mainClassName'.
 2018-10-19 15:54:47 -07: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
9740a97bbf
Add missing translations for market provider info 2018-10-19 16:51:50 +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
15177e6537
Add comment 2018-10-17 14:21:31 -05:00
Manfred Karrer
b37de6a507
Merge pull request #1781 from m52go/refine-shutdown-message 
Refine shutdown message to warn about open offers
 2018-10-17 11:02:58 -05:00
Manfred Karrer
dbe5cf6f85
Replace double quote with single 
Double quotes are only needed when a placeholder ({0}) is used in the text. Otherwise it would show 2 quotes.
 2018-10-17 11:02:34 -05:00
Manfred Karrer
4d30fcb46d
Merge branch 'master' into Dao-UI-improvements 2018-10-17 10:59:05 -05:00
Manfred Karrer
0c5df1061c
Change delay for storage from 2 sec to 200 ms 2018-10-17 10:52:37 -05:00
Steve Jain
227eefc4b3
Refine shutdown message to warn about open offers 2018-10-17 11:05:03 -04: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
e6f44ff1ae
Comment out BsqState in PB definitions 2018-10-16 23:22:50 -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
Manfred Karrer
8e46b1760f
Add new storage type to p2p library 
- We introduce a new basic storage type for reading from a resource file
if available and reading initial db file if available. That is required
for the snapshots of the DaoState which will be shipped with the source
code.

- We separate the support for maps to MapStoreService
 2018-10-16 23:16:52 -05:00
Devin Bileck
cdb7318acd
Merge remote-tracking branch 'upstream/master' into fix-typos 2018-10-16 15:14:28 -07:00
Devin Bileck
8d125a236c
Update README with minor clarification 2018-10-16 15:13:55 -07:00
Devin Bileck
5e27cbb2f6
Fix field visibility for fixed amount offer 2018-10-16 14:52:41 -07:00
Manfred Karrer
d33298d087
Add more tests 2018-10-16 13:53:58 -05:00
Christoph Atteneder
8cec4df80e
Fix merging error 2018-10-16 19:49:44 +02:00
Christoph Atteneder
95fa81361e
Merge branch 'master' of github.com:bisq-network/bisq into redesign 2018-10-16 19:45:50 +02:00
Manfred Karrer
dabe6907e1
Fix missing sorting 2018-10-16 12:40:10 -05: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
dd568111a5
Update translations without colons 2018-10-16 19:35:05 +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
254059b411
Fix typo 2018-10-16 11:57:50 -05:00
Manfred Karrer
1fadef15ef
Merge branch 'ManfredKarrer-arbitration-system-improvements' 2018-10-16 11:51:24 -05: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