Christoph Atteneder
a22e5d5b2b
Adapt create offer screen
2018-09-24 11:31:41 +02:00
Christoph Atteneder
fd07bff243
Fix padding and use translation keys
2018-09-20 16:38:27 +02:00
Christoph Atteneder
de48516a04
Use JFXComboBox for filtering with label on top
2018-09-20 12:11:57 +02:00
Christoph Atteneder
cf7884d864
Add password field behavior with floating text
2018-09-19 09:09:31 +02:00
Manfred Karrer
705025fea9
Add info for Faster Payment that the receivers name is not required
...
See:
https://github.com/bisq-network/bisq/issues/1693
2018-09-18 17:34:58 -05:00
Manfred Karrer
61caac07c2
Merge pull request #1688 from ManfredKarrer/master
...
Add Citibank to supported Zelle banks, update DAO rpc doc
2018-09-18 17:00:05 -05:00
Christoph Atteneder
db179914ad
Remove not thrown exceptions
2018-09-18 20:50:01 +02:00
Christoph Atteneder
f7e4e5ae14
Add missing result handler execution
2018-09-18 20:29:10 +02:00
Manfred Karrer
824d231a69
Add Citibank to supported Zelle banks
...
See: https://github.com/bisq-network/payment-methods/issues/10
2018-09-15 09:54:14 -05:00
Christoph Atteneder
40eadcc6e9
Merge branch 'master' into java10-support
2018-09-14 16:05:16 +02:00
Christoph Atteneder
4c068af7b3
Use default security provider instead of Bouncy Castle
2018-09-14 16:02:58 +02:00
Aruna Surya
cd5c5eda65
Improve grammar of Welcome text
2018-09-13 20:01:10 +02:00
Christoph Atteneder
64370f7adb
Fix JMockit setup
2018-09-13 10:46:07 +02:00
Aruna Surya
a89d22118d
Improve grammar of seed info
2018-09-11 21:40:40 +02:00
Christoph Atteneder
8ed7f4218f
Add not working JMockit setup (help wanted)
2018-09-07 14:03:52 +02:00
Christoph Atteneder
e319449186
Make power mock tests Java 10 compatibile
2018-09-07 14:02:22 +02:00
Christoph Atteneder
bd9a208977
Update source compatibility to Java 10
2018-09-07 11:35:45 +02:00
Christoph Atteneder
73e4ee5f47
Update lombok library
2018-09-05 18:54:18 +02:00
Christoph Atteneder
7a5eb33b67
Merge commit for @chirhonul 's commit "core: Drop now unnecessary files" 8cd93def30bd7039f5c8da77c1c9eff0a8cc35d8
2018-09-05 11:00:49 +02:00
Christoph Atteneder
049655b685
Merge core repository at 4597613
2018-09-05 10:48:22 +02:00
Chris Beams
970095f9ab
Move core module to new bisq-core repository
2018-03-10 17:29:25 +01:00
Manfred Karrer
209fdffedf
Remove consensus module
2018-03-10 10:59:05 -05:00
Manfred Karrer
3af5975be0
Move io.bisq.consensus.UsedForTradeContractJson to io.bisq.common.consensus.UsedForTradeContractJson
2018-03-10 10:57:24 -05:00
Manfred Karrer
4dda4401e2
Rename RestrictedByContractJson to UsedForTradeContractJson
2018-03-10 10:52:58 -05:00
Manfred Karrer
0cd1318436
Apply to new data structure
2018-03-10 10:22:59 -05:00
Manfred Karrer
a8962c833a
Merge branch 'handle-genesis-change' of https://github.com/sqrrm/exchange into sqrrm-handle-genesis-change
...
# Conflicts:
# core/src/main/java/io/bisq/core/dao/node/consensus/GenesisTxController.java
2018-03-10 10:22:43 -05:00
Manfred Karrer
b44fdc9cd7
Merge branch 'list-wmcc' of https://github.com/WorldMobileCoin/bisq-exchange into WorldMobileCoin-list-wmcc
...
# Conflicts:
# core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
# gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
# gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2018-03-10 10:15:06 -05:00
Manfred Karrer
afe47c3ad7
Merge branch 'list-ROIcoin' of https://github.com/ghobson2013/exchange into ghobson2013-list-ROIcoin
...
# Conflicts:
# core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
2018-03-10 10:13:47 -05:00
Manfred Karrer
68dd8d9831
Rearrange code positions
2018-03-10 10:12:00 -05:00
Manfred Karrer
b5786f038f
Rearrange code positions
2018-03-10 10:09:25 -05:00
Manfred Karrer
e9a0d7e3ff
Merge branch 'list-din-altcoin' of https://github.com/dinerocoin/exchange into dinerocoin-list-din-altcoin
...
# Conflicts:
# core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
# gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2018-03-10 10:08:57 -05:00
Manfred Karrer
cd04e1b0f9
Put new code for altcoin in right places.
2018-03-10 10:06:42 -05:00
Manfred Karrer
8754f41c1e
Merge branch 'master' of https://github.com/angelcoinmoney/exchange into angelcoinmoney-master
2018-03-10 10:01:41 -05:00
Chris Beams
f20a904568
Merge pull request #1362 from tau3/refactoring/core-seed-nodes-repository
...
Refactoring of CoreSeedNodesRepository + unit tests
2018-03-10 11:11:04 +01:00
Chris Beams
47c7c4fb46
Re-apply "Fix wrong network ID for Dash"
...
This commit essentially cherry-picks the changes made in ea8cbc1
,
re-applying them after the renaming of CoreSeedNodesRepository =>
DefaultSeedNodeRepository that happened earlier on this branch. The
other changes made in that original commit are no longer relevant here,
or have already been made in earlier commits on this refactoring branch.
2018-03-10 11:01:23 +01:00
Chris Beams
cef131151c
Merge branch 'master' into tau3-refactoring/core-seed-nodes-repository
2018-03-10 10:59:42 +01:00
Manfred Karrer
0d45977913
Make constructor private, add Nullable.
2018-03-09 19:55:28 -05:00
Manfred Karrer
2afcef9eb5
Merge branch 'refactor-dao-data-model'
...
# Conflicts:
# core/src/main/java/io/bisq/core/dao/DaoModule.java
# core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockChain.java
# core/src/main/java/io/bisq/core/dao/blockchain/SnapshotManager.java
# core/src/main/java/io/bisq/core/dao/node/BsqNode.java
# core/src/main/java/io/bisq/core/dao/node/BsqParser.java
# core/src/main/java/io/bisq/core/dao/node/consensus/BsqTxController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/CompensationRequestController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/GenesisTxController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/IssuanceController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/PeriodController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/TxInputController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/TxInputsController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/TxOutputController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/VotingController.java
# core/src/main/java/io/bisq/core/dao/node/full/FullNode.java
# core/src/main/java/io/bisq/core/dao/node/full/FullNodeParser.java
# core/src/main/java/io/bisq/core/dao/node/full/network/FullNodeNetworkManager.java
# core/src/main/java/io/bisq/core/dao/node/full/network/GetBsqBlocksRequestHandler.java
# core/src/main/java/io/bisq/core/dao/node/lite/LiteNode.java
# core/src/main/java/io/bisq/core/dao/node/lite/LiteNodeExecutor.java
# core/src/main/java/io/bisq/core/dao/node/lite/LiteNodeParser.java
# core/src/main/java/io/bisq/core/dao/request/compensation/CompensationRequestManager.java
# core/src/test/java/io/bisq/core/dao/node/full/FullNodeParserTest.java
2018-03-09 19:47:08 -05:00
Manfred Karrer
dd5fe5d197
Use Interface for read and write access to BsqBlcokChain. Use SingleThreadExecutor in Full- and LiteNodeExecutor.
2018-03-09 19:45:40 -05:00
Manfred Karrer
92ccf73ca8
Merge branch 'fix-parsertest'
2018-03-09 15:03:26 -05:00
Manfred Karrer
42e712fce3
Merge branch 'fix-parsertest' of https://github.com/sqrrm/exchange into sqrrm-fix-parsertest
...
# Conflicts:
# core/src/test/java/io/bisq/core/dao/node/full/FullNodeParserTest.java
2018-03-09 15:02:57 -05:00
Manfred Karrer
c611eed0a6
Extract snapshot code from BsqBlockChain to SnapshotManager. Rename *Verification classes to *Controller. Add BsqBlockController.
2018-03-09 14:56:40 -05:00
Manfred Karrer
456fd28e94
Revert "Fix parsertest"
2018-03-09 14:42:56 -05:00
Manfred Karrer
182158af20
Merge pull request #1445 from sqrrm/fix-parsertest
...
Fix parsertest
2018-03-09 12:34:57 -05:00
sqrrm
f569776398
Fix FullNodeParserTest after refactoring
2018-03-09 18:06:33 +01:00
Manfred Karrer
e55bba63fb
Deactivate broken test temp.
2018-03-09 10:59:40 -05:00
sqrrm
4346b64c91
Handle change output from genesis transaction
2018-03-09 16:26:13 +01:00
Chris Beams
19b9c6fe59
Set Maven version to -SNAPSHOT
...
Problem: d218094
set the version to 0.7.0-SNAPSHOT, but that change
failed to produce the intended effect detailed in the commit comment.
Setting the version to a value like 0.7.0-SNAPSHOT works fine when
publishing artifacts to a local ~/.m2 repository, but JitPack has no
awareness of version metadata within pom files, and can only retreive
artifacts based on Git metadata, namely tags, branch names and commit
hashes. This means it is impossible to resolve artifacts from JitPack
with a GAV like `io.bisq.exchange:core:0.7.0-SNAPSHOT` unless there is a
branch named `0.7.0`. This is why the pull request at
bisq-network/bisq-seednode#1 failed.
Solution: JitPack supports the semantics of Maven-style `-SNAPSHOT`
versioning, and as a special case, allows for versions to be named
literally `-SNAPSHOT` with no preceding version string [1,2]. This
commit sets all Maven versions to `-SNAPSHOT`, achieving the original
effect intended by d218094
. Now downstream components (like
bisq-seednode) can resolve dependencies seamlessly from JitPack or a
local ~/.m2 repo with a GAV like `io.bisq.exchange:core:-SNAPSHOT`. This
is a slightly unconventional arrangement, but should actually result in
fewer updates to pom files over time as there may in fact be no reason
to ever change this version string so long as we continue using JitPack
and avoid publication to Maven Central / JCenter or similar.
[1]: https://jitpack.io/docs/#building-with-jitpack
[2]: https://github.com/jitpack/jitpack.io/issues/351
See #1440
2018-03-09 10:29:23 +01:00
Manfred Karrer
92514a25e8
Refactor BsqBlockChain with ReadModel and WriteModel
2018-03-09 00:43:20 -05:00
Manfred Karrer
da657ed055
Merge pull request #1440 from cbeams/change-groupid-and-version
...
Update artifact metadata to allow seamless resolution from JitPack or local ~/.m2 repo
2018-03-08 22:01:41 -05:00