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
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
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
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
01cf2a46cb
Adapt preference view to match design template
2018-10-22 17:47:01 +02:00
Christoph Atteneder
9740a97bbf
Add missing translations for market provider info
2018-10-19 16:51:50 +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
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
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
Steve Jain
227eefc4b3
Refine shutdown message to warn about open offers
2018-10-17 11:05:03 -04: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
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
Manfred Karrer
d33298d087
Add more tests
2018-10-16 13:53:58 -05: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
Manfred Karrer
254059b411
Fix typo
2018-10-16 11:57:50 -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
Manfred Karrer
dc6c25ed81
Merge branch 'master' into arbitration-system-improvements
2018-10-16 11:32:07 -05: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
5879dd98df
Change log level for printing asset trade stats
2018-10-10 15:34:02 -05:00
Manfred Karrer
62a824653d
Update comments
2018-10-10 15:33:01 -05:00
Manfred Karrer
c3f508e24c
Adjust DAO params
2018-10-10 15:20:17 -05:00
Manfred Karrer
aeebae9297
Support trade fees defined DAO params
...
- Use DAO Params to get the trade fees
- Rename existing params
- Add min fee values
2018-10-10 15:02:38 -05:00
Manfred Karrer
048767af1a
Make ProposalConsensus and CompensationConsensus methods static
2018-10-10 14:28:49 -05:00
Manfred Karrer
4b9073ce8a
Rename support for other base currencies in getDefaultMinFeePerByte
2018-10-10 14:28:03 -05:00
Manfred Karrer
965d741657
Rename fields and params
2018-10-10 14:21:11 -05:00
Manfred Karrer
8e22916914
Adjust comments
2018-10-10 14:18:56 -05:00
Manfred Karrer
923aaf6cdc
Remove other base currencies from FeeService
2018-10-10 14:06:24 -05:00
Manfred Karrer
c8f0098b2b
Add comments, cleanups
2018-10-10 14:03:53 -05:00
Manfred Karrer
280af36fc5
Reduce default btc miner fee from 200 to 50 sat/byte
2018-10-10 13:47:26 -05:00
Manfred Karrer
e99d733642
Remove PHASE_BREAK4, adjust phase periods and fees
2018-10-10 13:39:51 -05:00
Manfred Karrer
db3cd329b9
Add VoteResultExceptionHandler
2018-10-09 23:31:43 -05:00
Manfred Karrer
9b40306d9a
Add handling for missing proposal data
2018-10-09 22:32:03 -05:00
Manfred Karrer
5141806509
Add handling for missing blindVote data
2018-10-09 22:00:02 -05:00
Manfred Karrer
58e6db0a25
Persist DecryptedBallotsWithMeritsList
2018-10-08 20:13:22 -05:00
Manfred Karrer
4cc17feace
Persist EvaluatedProposalList
2018-10-08 19:47:54 -05:00
Manfred Karrer
d279dae032
Rename chainHeadHeight to chainHeight
2018-10-08 11:22:57 -05:00
Manfred Karrer
57355f2b19
Merge branch 'Dao-UI-improvements'
2018-10-08 11:18:42 -05:00
Manfred Karrer
d87bbf9318
Merge pull request #1763 from ManfredKarrer/tx-broadcaster-fix
...
Tx broadcaster fix
2018-10-08 07:10:52 -05:00
Manfred Karrer
8232eeecd8
Deactivate OKPay as it does not exist anymore
...
OkPay seems to have rebranded to Weezzo.
The OkPay webpage is offline but some links go to Weezzo.
Seems pretty unprofessional hwo they did the move...
Seems they have been involved with BTC-e…
https://bitcointalk.to/index.php?topic=2094721.0
2018-10-07 21:54:00 -05:00
Manfred Karrer
be1f177fc7
Increase timeout to 30 sec
2018-10-07 17:40:44 -05:00
Manfred Karrer
85c80bcd5c
Remove the maybeCommitTx call at timeout
2018-10-07 17:40:01 -05:00
Manfred Karrer
fbbec72eb0
Merge branch 'master' into arbitration-system-improvements
2018-10-07 00:47:42 -05:00
Manfred Karrer
5dfbb6d596
Merge branch 'master' into Dao-UI-improvements
2018-10-07 00:46:48 -05:00
