mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,872 Commits 4 Branches 148 Tags 4.3 GiB
e0de9982e2
Commit Graph

915 Commits

Author SHA1 Message Date
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
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
4fd641fd51
Improve UI 2018-10-19 21:00:50 -05: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
Manfred Karrer
4d30fcb46d
Merge branch 'master' into Dao-UI-improvements 2018-10-17 10:59:05 -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
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
sqrrm
b3c8610f10
Add bonded reputation service, storage 2018-10-16 17:11:40 +02:00
sqrrm
7b72f10eb2
Add bonded reputation 2018-10-14 12:51:36 +02: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
2d593ee88f
Merge branch 'master' into arbitration-system-improvements 2018-10-05 15:21:41 -05:00
Manfred Karrer
4770ac9ef5
Remove asset from comboBoxes if it was removed by voting 2018-10-05 00:46:03 -05:00
Manfred Karrer
3e7eba8f04
Add Generic- and removeAsset proposals 2018-10-04 23:24:14 -05:00
Manfred Karrer
248c5546be
Refactor parser classes 
- Move unlockBlockHeight field from Tx to TxOutput
 2018-10-03 21:31:26 -05:00
Manfred Karrer
e11e2b3c9e
Fix PB enum 
As PB handles enums globally there must not be same entries in 2 diff.
enums. Therefore I postfixed with _OUTPUT 3 entries in TxOutputType.
 2018-10-03 17:32:34 -05:00
Manfred Karrer
48fa9e75c9
Fix incorrect TxType entries in PB definitions 2018-10-03 17:28:44 -05:00
Manfred Karrer
7d045f028f
Fix incorrect/missing TxOutputType entries in PB definitions 2018-10-03 17:12:51 -05:00
Manfred Karrer
b2fd120eff
Add arbitrator_node_address to PB 2018-10-02 22:27:01 -05:00
Manfred Karrer
8bcefaa135
Implement new arbitrator selection rule 2018-10-02 22:09:15 -05:00
Manfred Karrer
1e7dc5e95f
Add arbitrator to OfferAvailabilityResponse 2018-10-02 18:17:15 -05:00
Manfred Karrer
8eabd665c7
Fix snapshot handling 
- Fix wrong start height
- Improve logging
 2018-09-26 22:41:41 -05:00
Manfred Karrer
0bf859e3e3
Add shortcut to toggle tor logging 
- If user press cmd+t it switches to DEBUG log level for the tor
network library. If the user press it again it switch back to WARN level.
- If there is a connection startup timeout where we display the Tor
network settings popup we switch log level as well to DEBUG.
 2018-09-26 15:26:56 -05:00
Manfred Karrer
8414911395
Update libdohj to d4ace7bc 2018-09-25 00:43:19 -05:00
Manfred Karrer
bfc7320ddc
Update to libdohj 411a920e 
Update dependencyVerification entries
 2018-09-24 11:15:49 -05:00
Manfred Karrer
416d9ba8f3
Play silent sound to avoid standby mode 
Apple disabled options do avoid App Nap in recent OSX versions.
Playing an inaudible sound marks the application for preventing to get
set to standby mode as well as App Nap mode.
The alternative to that "hack" would be to add OSX native code, but
even then it is likely only possible to prevent App Nap but not
sleep mode.
If Bisq is in App Nap mode offers cannot be taken as well the user loses
network connection and offers.
See: https://github.com/bisq-network/bisq/issues/1701
 2018-09-21 14:50:03 -05:00
Christoph Atteneder
4c068af7b3
Use default security provider instead of Bouncy Castle 2018-09-14 16:02:58 +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
00bce03695
Fix Javadoc errors 2018-09-05 11:20:44 +02:00
Christoph Atteneder
fce7f45a41
Merge common project at 6085d83 2018-09-05 10:39:56 +02:00
Chris Beams
2c0392bceb
Move common module to new bisq-common repository 2018-03-10 17:31:14 +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
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
cc065e6c85
Rearrange code positions 2018-03-10 10:13:55 -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
7cb674a0a4
Merge branch 'master' of https://github.com/swordfish6975/exchange into swordfish6975-master 
# Conflicts:
#	gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
 2018-03-10 10:11:49 -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
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
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
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
Manfred Karrer
8e99e7c1e6
Refactor OpReturnVerification. 2018-03-08 21:57:54 -05:00
Manfred Karrer
cf9fc6714d
Refactor check if a tx is a bsq tx. 2018-03-08 20:59:49 -05:00
Chris Beams
d218094269
Bump Maven artifact versions to 0.7.0-SNAPSHOT 
Problem: When resolving Bisq libraries, e.g. `core` or `network` from
JitPack for use in other components like bisq-seednode or
bisq-pricenode, we have historically, resolved them by tag or by
branchname, e.g. with GAV coordinates like `io.bisq:core:v0.6.7` or
`io.bisq:core:master`. This works well enough, but now that we are
beginning to modularize more aggressively, we want to make sure that
it's possible at any time to publish the latest snapshots of these
libraries to one's own local ~/.m2 repository such that they can be
easily resolved from downstream components without the need to push
commits to the bisq-network/exchange remote, and to wait for JitPack to
do a just-in-time build.

Solution: By updating the version value of all modules here in the
exchange repository from 0.6.7 => 0.7.0-SNAPSHOT, one can run
`mvn install` to publish the latest "snapshot" of exchange libraries to
the local ~/.m2 repository and be sure to resolve them from whatever
downstream component that they are working on. The -SNAPSHOT qualifier
ensures that no caching occurs, and that the very latest such binary
will always be used.

This new arrangement creates a situation where one can transparently
resolve these dependencies remotely from JitPack and then subsequently
resolve them locally from one's ~/.m2 repository without having to
change a line of code.

It also opens up the ability to manage all Bisq components together in a
single IDE window as if they were all in one repository, avoiding the
need even to issue a `mvn install` command to publish locally--but
that's not the main focus of this change.

Note that the change to 0.7.0 here is based on the fact that we already
planned to have the next version shipped from `master` be 0.7.0, as
there are quite a few new UI changes that probably merit the bump in
minor version. The version change also aligns well with the fact that
we're modularizing a number of components right now, and all
newly-extracted components have been jumping to v0.7.0 to indicate their
new independent status. This has been the case with bisq-seednode and
pricenode so far.

Finally, it is important to note here that the ONLY versions updated by
this change are those specific to Maven metadata and therefore artifact
management / dependency resolution. The version that the Bisq desktop
client reports in its UI and to the network in its user agent has NOT
been changed, on account of the fact that users may run Bisq from
source, and we need to think through more fully the implications of
reporting a verison like 0.7.0-SNAPSHOT in those situations. Here is a
list of files containing the old version (0.6.7) that have NOT been
updated:

 - common/src/main/java/io/bisq/common/app/Version.java
 - package/linux/32bitBuild.sh
 - package/linux/Dockerfile
 - package/osx/create_app.sh
 - package/osx/finalize.sh
 - package/windows/32bitBuild.bat
 - package/windows/64bitBuild.bat
 - package/windows/Bisq.iss
 - package/linux/64bitBuild.sh

One thing we know for sure that wouldn't work here is that Bisq's
Version class currently does not support -SNAPSHOT qualifiers. It just
breaks the version string validation entirely. So we'd need to patch
that in any case if we do decide it's a good idea to let pre-release
builds report their version accurately.
 2018-03-08 19:49:30 +01:00
Chris Beams
19d8c252ba
Change groupid from io.bisq => io.bisq.exchange 
Problem: The current `io.bisq` groupid does not align with the way
JitPack supports custom groupids. In order to be able to both resolve
artifacts from JitPack *and* be able to resolve the same artifacts from
one's local ~/.m2 repository, Bisq artifacts need to have the same GAV
coordinates everywhere (groupid, artifactid, version).

Solution: This commit changes all groupids from io.bisq =>
io.bisq.exchange to match the GAV coordinates produced / expected by
JitPack.

So where Bisq's core module would previously have been resolvable with
GAV coordinates `io.bisq:core:v0.6.7` it will now be resolvable as
`io.bisq.exchange:core:v0.6.7`.

Note that this change is not just to satisfy JitPack idiosyncracies, but
is actually good naming practice anyway where a multi-module build is
involved, and is arguably the way it should have been all along.

[1]: https://jitpack.io/docs/#publishing-on-jitpack
 2018-03-08 18:59:31 +01:00
Manfred Karrer
df093b9712
Remove TxVo and put fields into Tx instead. 2018-03-08 10:50:15 -05:00
park-alter
5cc333e33f list-wmcc 2018-03-07 21:01:34 +08:00
Christoph Atteneder
7cc4a286b8
Change wording from distance to below/above 2018-03-07 13:17:19 +01:00
ghobson2013
c51851809c adding ROIcoin 2018-03-06 11:11:31 -06:00
Manfred Karrer
b5ac9f97ca
Add vote reveal type. Adjust BSQ fees. Refactorings. 2018-03-05 22:00:13 -05:00
Manfred Karrer
b706edd15a
Merge branch 'show-past-comps' of https://github.com/sqrrm/exchange into sqrrm-show-past-comps 2018-03-05 18:03:16 -05:00
Manfred Karrer
4e66daed8d
Change display text. Remove dev value. 2018-03-05 12:15:25 -05:00
Manfred Karrer
b7064f9820
Add option key for dev mode 2018-03-05 11:10:00 -05:00
sqrrm
dd591a1a43
Add PastCompensationRequestView 
Let Active and PastCompensationRequestView share a base class view
 2018-03-05 16:58:06 +01:00
Manfred Karrer
aac493cc41
Add Restrictions with min and max comp request amounts. Refactor validator. 2018-03-05 10:33:25 -05:00
Manfred Karrer
a60f56c623
Merge branch 'compensation-req-checks' of https://github.com/sqrrm/exchange into sqrrm-compensation-req-checks 2018-03-05 09:39:42 -05:00
swordfish5975
82f41cbfcd Strayacoin 2018-03-04 15:56:44 +10:00
dinerocoin
25cd791608 add Dinero 2018-03-03 22:21:37 +00:00
Manfred Karrer
a1befee0bd
Use common superclass for Create- and TakeOfferDataModel to avoid code duplication. 2018-03-01 18:47:38 -05:00
Angelcoin
22715c5731
Update CurrencyUtil.java 2018-02-27 14:09:55 +02:00
Manfred Karrer
1d0591084d
Merge branch '0.6.7' 
# Conflicts:
#	common/pom.xml
#	common/src/main/java/io/bisq/common/app/Version.java
#	common/src/main/resources/i18n/displayStrings.properties
#	common/src/main/resources/i18n/displayStrings_hu.properties
#	common/src/main/resources/i18n/displayStrings_ro.properties
#	consensus/pom.xml
#	core/pom.xml
#	core/src/main/java/io/bisq/core/offer/OpenOfferManager.java
#	core/src/main/java/io/bisq/core/payment/PaymentAccountUtil.java
#	core/src/main/java/io/bisq/core/provider/fee/FeeService.java
#	gui/pom.xml
#	gui/src/main/java/io/bisq/gui/bisq.css
#	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
#	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
#	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
#	gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
#	gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java
#	gui/src/main/java/io/bisq/gui/util/GUIUtil.java
#	monitor/pom.xml
#	network/pom.xml
#	network/src/main/resources/PersistableNetworkPayloadMap_BTC_MAINNET
#	package/linux/32bitBuild.sh
#	package/linux/64bitBuild.sh
#	package/linux/Dockerfile
#	package/osx/create_app.sh
#	package/osx/finalize.sh
#	package/windows/32bitBuild.bat
#	package/windows/64bitBuild.bat
#	package/windows/Bisq.iss
#	pom.xml
#	seednode/pom.xml
#	statistics/pom.xml
 2018-02-26 22:03:47 -05:00
Manfred Karrer
fd47cefc6c
Set v0.6.7 2018-02-26 20:23:07 -05:00
Manfred Karrer
c19cf3c0cd
Merge pull request #1383 from blabno/feature/extract-USE_DEV_PRIVILEGE_KEYS-from-dev-env 
Make USE_DEV_PRIVILEGE_KEYS flag configurable
 2018-02-26 12:48:29 -05:00
Manfred Karrer
2c593559db
Merge 0.6.6 branch to master 2018-02-23 21:40:34 -05:00
Manfred Karrer
0b6edbb883
Set version 0.6.6 2018-02-23 15:41:24 -05:00
Chris Beams
b01af2e666
Refine text of per-trade limit info popup (#1388) 2018-02-23 21:38:05 +01:00
Manfred Karrer
a04f96335b
Add new altcoins: Cassubian Detk, DigiMoney, SpeedCash, SOS Coin, AchieveCoin, vDinar (#1385, #1381, #1377, #1370, #1369, #1367) 2018-02-23 11:10:06 -05:00
Manfred Karrer
2183227cf7
Rename "MoneyBeam" to "MoneyBeam (N26)" (#1349) 2018-02-23 10:11:52 -05:00
Manfred Karrer
82541e6fac
Add DeepOnion to main currencies list 2018-02-23 08:43:41 -05:00
Manfred Karrer
3e3fd3ab45
Remove DOGE as basecurrency 2018-02-23 08:35:41 -05:00
Manfred Karrer
6f342c8d5a
Add popup explaining trade limits #1388 2018-02-22 20:53:59 -05:00
Manfred Karrer
2389611c39
Re-enable national bank transfer for US 2018-02-22 19:54:13 -05:00
Manfred Karrer
e5a1953929
Add payment method Revolut #1312 2018-02-22 19:48:37 -05:00
Manfred Karrer
7a96181ccc
Merge pull request #1378 from stevenkain/patch-7 
Update displayStrings.properties
 2018-02-21 14:32:48 -05:00
Bernard Labno
051694dfdb Make USE_DEV_PRIVILEGE_KEYS flag configurable 2018-02-21 16:29:57 +01:00
Christoph Atteneder
d377eec122
Merge pull request #1379 from stevenkain/patch-8 
Update displayStrings_hu.properties
 2018-02-21 09:23:32 +01:00
stevenkain
6af2fccb89
Update displayStrings_ro.properties 
New Romanian translations
 2018-02-20 23:08:35 +02:00
stevenkain
601bd9ea4e
Update displayStrings_hu.properties 
New translations
 2018-02-20 23:03:44 +02:00
stevenkain
f0a676bd33
Update displayStrings.properties 
"both trades" makes no sense. Shouldn't it be "both traders"?
 2018-02-20 22:41:35 +02:00
sqrrm
86c3516890
Fix comments from PR 2018-02-19 13:53:57 +01:00
Bernard Labno
5471a8c9ca Not possible to select English anymore, if system locale is non-English 2018-02-19 11:08:44 +01:00
Manfred Karrer
649c14d28e
Merge pull request #1360 from ripcurlx/shorten-call-to-action-buttons 
Shorten labels in call-to-action buttons in offer book
 2018-02-18 21:29:44 -05:00
Manfred Karrer
dd86ead7d8
Add popmoney (#1273) 2018-02-18 20:20:04 -05:00
Manfred Karrer
378134c413
Add holder name to venmo 2018-02-18 19:38:44 -05:00
Manfred Karrer
a129d06863
Use Cashtag only for CashApp 2018-02-18 19:38:27 -05:00
Manfred Karrer
7654a5d8ff
Add payment method Venmo (#1347) 2018-02-18 19:08:03 -05:00
Manfred Karrer
beaaf59b70
Add feature for deactivating an offer #1368 2018-02-18 14:45:02 -05:00
sqrrm
fa2c33e5d1
Check that min comp req is more than comp req fee 2018-02-17 16:54:48 +01:00
sqrrm
a5364c9f3f
Display txid for compensation requests 2018-02-14 16:16:42 +01:00
Christoph Atteneder
04e5cef9ee
Rename singular/plural translation keys to make it less error-prune and add missing translations for all locales 2018-02-14 12:56:08 +01:00
Christoph Atteneder
436289edc9
Shorten labels in call-to-action buttons in offer book 2018-02-14 12:34:00 +01:00
Christoph Atteneder
899d6aef02
Add german translation 2018-02-14 11:27:05 +01:00
Manfred Karrer
521dd62114
Change max. deviation of market price #1356 2018-02-13 21:10:55 -05:00
Manfred Karrer
0a1dc70ec0
Fix sorting of altcoins 2018-02-13 20:37:26 -05:00
Manfred Karrer
bd6b70a8ba
Add new altcoins: Stellite, Dai Stablecoin, Obsidian, BitDaric, Yenten 2018-02-13 20:34:43 -05:00
Manfred Karrer
f8850dfd0a
Merge branch 'list-odn-coin' of https://github.com/Manbearpixel/exchange into Manbearpixel-list-odn-coin 
# Conflicts:
#	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
 2018-02-13 20:23:02 -05:00
Manfred Karrer
879d8e0660
Merge branch 'add-darx-altcoin' of https://github.com/bitdaric/exchange into bitdaric-add-darx-altcoin 
# 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-02-13 20:19:14 -05:00
Manfred Karrer
c22f52477f
Add Yenten 2018-02-13 20:17:09 -05:00
Manfred Karrer
22a3b94d40
Add Yenten 2018-02-13 20:16:53 -05:00
Manfred Karrer
2f04d1ca89
Merge pull request #1342 from reverendus/list-dai-token 
Add DAI Token
 2018-02-13 20:11:56 -05:00
Manfred Karrer
2a9305c14b
Disable dev mode 2018-02-13 20:09:05 -05:00
Manfred Karrer
eb0a8b8d49
Add payment method MoneyBeam (#1349) 2018-02-13 20:00:35 -05:00
Manfred Karrer
ad56c26f7f
Add payment method Cash App (#1049) 2018-02-13 19:42:29 -05:00
Manfred Karrer
ead30822e5
Add payment method Uphold 2018-02-13 15:32:44 -05:00
Manfred Karrer
949c1c6f2a
Merge pull request #1352 from ripcurlx/change-offerbook-column-headers 
Change offerbook column headers
 2018-02-13 12:42:05 -05:00
Manfred Karrer
e5e7ded68f
Merge pull request #1334 from ripcurlx/change-goto-screen-after-trade 
Change path after completed trade
 2018-02-13 12:38:45 -05:00
Manfred Karrer
d653e8263d
Change text for portfolio.pending.tradePeriodWarning 2018-02-13 12:37:06 -05:00
Manfred Karrer
311b67573f
Merge pull request #1328 from ripcurlx/improve-info-during-trade-process 
Improve info during trade process
 2018-02-13 12:33:05 -05:00
Manfred Karrer
f29f0e03d7
Change Bitcoin Classic to Bitcoin Clashic 2018-02-13 12:28:17 -05:00
Manfred Karrer
2287ec1eab
Merge pull request #1321 from stevenkain/patch-5 
Update displayStrings.properties
 2018-02-13 12:27:22 -05:00
Manfred Karrer
6ca1f2500a
Merge pull request #1316 from ripcurlx/finalize-info-icon-for-funds-needed 
Finalize info icon for funds needed
 2018-02-13 12:06:44 -05:00
Christoph Atteneder
6de488bcc1
Add translations for changed string 2018-02-13 12:46:18 +01:00
Christoph Atteneder
dc2d94b486
Use header label for buy and sell offers that is easier to understand 2018-02-13 12:29:37 +01:00
Manfred Karrer
e6001b17da
Fix wrong fee estimation (#1325) 2018-02-12 13:49:15 -05:00
Hein Bloed
45b2693048 added ODN to createAllSortedCryptoCurrenciesList 2018-02-11 14:02:21 -06:00
bitdaric
51e2d89e5c
add BitDaric 2018-02-11 10:43:24 +03:30
Poompon
fc94fb564e Add YENTEN [YTN] validaion 2018-02-10 15:34:52 +03:00
reverendus
0b83d9de23 Add DAI Token 2018-02-10 11:34:40 +01:00
Christoph Atteneder
65d2c03eac
Change path after completed trade 2018-02-07 16:28:24 +01:00
Christoph Atteneder
d03dd58144
Add info pop over for trade period 2018-02-06 11:18:57 +01:00
Bernard Labno
4b0692c6e0 Use environment locale to select right locale and currency 2018-02-05 12:50:47 +01:00
Christoph Atteneder
a4359e9557
Improve English translation and add German ones 2018-02-05 11:07:53 +01:00
Christoph Atteneder
b1aa86a57c
Add account age translation 2018-02-05 10:13:09 +01:00
Christoph Atteneder
09807a0744
Merge remote-tracking branch 'upstream/master' into improve-info-during-trade-process 
# Conflicts:
#	common/src/main/resources/i18n/displayStrings_ro.properties
 2018-02-05 10:09:55 +01:00
Manfred Karrer
53ec4b2404
Merge pull request #1307 from stellitecoin/master 
Add Stellite Coin
 2018-02-02 20:11:12 -05:00
stevenkain
2f0a6c1bc9
Update displayStrings_ro.properties 
New translation
 2018-02-03 00:53:56 +02:00
stevenkain
422f5493de
Update displayStrings.properties 
1. blocked by your internet provider or in your country - by your country
2. sent you -> send you
3. capitalized Bisq
4. I would love me some of that Bitcoin Clashic :)
 2018-02-03 00:37:14 +02:00
Christoph Atteneder
bd4692f520
Fix wrong expectation of formatter method and add new translations for handling trade limits 2018-02-02 15:31:47 +01:00
Christoph Atteneder
76046c3de6
Remove trade date until from max trade period 2018-02-02 15:27:19 +01:00
Christoph Atteneder
75f0b4ad71
Remove translation that is not used 2018-02-02 15:21:45 +01:00
Manfred Karrer
1149a46837
Merge branch 'ripcurlx-use-info-icon-for-funds' 2018-02-01 15:52:43 -05:00
Manfred Karrer
ee9b133f65
Merge branch 'Development' 
# Conflicts:
#	gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java
#	gui/src/main/java/io/bisq/gui/main/overlays/windows/TorNetworkSettingsWindow.java
 2018-02-01 14:10:42 -05:00
Christoph Atteneder
89a3939728
Add fee and deposit information to total funds to pay field 2018-02-01 15:05:24 +01:00
Manfred Karrer
664f094d99
Handle delete of spv chain file at startup for windows 2018-01-31 19:19:49 -05:00
Manfred Karrer
04560092ba
Improve handling of Tor shutdown 2018-01-31 16:52:35 -05:00
Manfred Karrer
89e11ac0e4
Handle locked files at delete directory method. Improve UI handling for TorNetworkSettingWindow 2018-01-31 15:44:30 -05:00
Stellite
a380381e94
fix formatting 2018-02-01 01:11:32 +05:30
root
2b2773e666 Adding STL Token 2018-01-31 19:39:16 +00:00
Manfred Karrer
bf244856b1
v0.6.5 2018-01-31 13:04:24 -05:00
Manfred Karrer
eeeabaf015
Fix typos 2018-01-31 11:42:16 -05:00
Manfred Karrer
64ba300408
Add cleanup tor files button to tor network settings 2018-01-31 00:25:39 -05:00
Manfred Karrer
bfc54f4d68
Add REF token 2018-01-30 19:42:14 -05:00
Manfred Karrer
8098e3c0c6
Merge remote-tracking branch 'origin/master' 2018-01-30 15:03:47 -05:00
Chris Beams
183389356f
Merge pull request #1294 from bisq-network/fix-custom-btc-nodes-issue-#1291 
Fix issue with custom btc nodes
 2018-01-30 20:59:19 +01:00
Manfred Karrer
25190bbe1f
Merge pull request #1296 from ripcurlx/add-util-tests 
Add util tests
 2018-01-30 14:58:41 -05:00
Manfred Karrer
1e13375b9c
Merge remote-tracking branch 'origin/master' 2018-01-30 14:45:16 -05:00
Manfred Karrer
8732aeab54
Merge pull request #1287 from bisq-network/TradePeriodStartsAfterConfirmation 
Start trading period after deposit transaction confirmation
 2018-01-30 14:45:01 -05:00
Manfred Karrer
9ac49bd91a
Change guard logic for bitcoinNodesString 2018-01-30 11:41:42 -05:00
Christoph Atteneder
3d36e56532
Add first simple test for getTradeCurrency 2018-01-30 10:58:58 +01:00
Manfred Karrer
a09df40571
Change sorting 2018-01-29 11:27:21 -05:00
Manfred Karrer
50c1607126
Merge pull request #1290 from bisq-network/fix-zero-balance-after-restore 
Fix zero balance after restore
 2018-01-29 10:09:01 -05:00
Manfred Karrer
d6d5993627
Merge MVT 2018-01-28 19:15:19 -05:00
Manfred Karrer
20fd6a706e
Merge branch 'list-betr-token' of https://github.com/BetterBetting/exchange-bisq-network into BetterBetting-list-betr-token 2018-01-28 19:08:49 -05:00
Manfred Karrer
b220c1a6e2
Add new strings. Cleanup. 2018-01-26 22:25:03 -05:00
Manfred Karrer
f91da81f87
Reuse FileUtil.renameFile 2018-01-26 22:18:47 -05:00
Manfred Karrer
648a7d4a0b
Add handling for canonical at Windows at file delete. 2018-01-26 22:17:33 -05:00
Manfred Karrer
4af8d44d7e
Change open dispute text 2018-01-26 20:07:36 -05:00
Manfred Karrer
537a9ad8ff
Change open dispute text (make open dispute optional) 2018-01-26 19:55:59 -05:00
Manfred Karrer
3e32a71d64
Improve logic flow of getTimeWhenDisputeOpens. Cleanup. 2018-01-26 14:33:44 -05:00
Manfred Karrer
2a004a2f68
Merge branch 'master' into TradePeriodStartsAfterConfirmation 
# Conflicts:
#	core/src/main/java/io/bisq/core/btc/wallet/WalletConfig.java
 2018-01-26 12:22:45 -05:00
Chris Beams
f1d0abef4a
Fix typos and English errors in banned node dialog 2018-01-26 16:58:37 +01:00
Saborknight
438e426a4d
Add BETR (Better Betting) token 2018-01-25 17:10:46 +00:00
Manfred Karrer
a0cdffaddc
Deactive dev flags 2018-01-24 20:46:32 -05:00
Manfred Karrer
6895ac9105
Refactoring: Rename methods 2018-01-24 20:43:30 -05:00
Manfred Karrer
f1d60ddcdb
Fix wrong argument at callFunctionWithWriteLock 2018-01-24 20:21:22 -05:00
Manfred Karrer
125143c8f5
Merge branch 'bsqparser-test' of https://github.com/sqrrm/exchange into sqrrm-bsqparser-test 2018-01-24 20:13:59 -05:00
Manfred Karrer
34dd0b71d0
Merge branch 'Development' into dao 
# Conflicts:
#	gui/src/main/java/io/bisq/gui/bisq.css
#	gui/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.java
#	gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java
#	gui/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java
#	gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.java
#	gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java
 2018-01-24 19:44:01 -05:00
sqrrm
e9e4a827ca
bsqblockchain: use write lock for atomic writes 
A ReentrantReadWriteLock is used. By acquiring the write lock over the
atomic write all other locks acquired during the atomic operation will
work as expected.
 2018-01-23 15:37:22 +01:00
Manfred Karrer
d341c44471
Merge branch 'master' into Development 2018-01-22 20:29:30 -05:00
Manfred Karrer
14b0292460
Merge branch 'Development' into UI-improvements 2018-01-22 19:44:51 -05:00
Chris Beams
c725376e8d
Replace 'that' => 'this' in version update dialog 2018-01-22 08:55:32 +01:00
Manfred Karrer
33eecd81aa
Release 0.6.4 2018-01-20 20:47:53 -05:00
Manfred Karrer
0dc5d82983
Add XIN 2018-01-20 19:41:07 -05:00
Manfred Karrer
0594bddd0d
Add CREA coin 2018-01-20 19:38:00 -05:00
Manfred Karrer
9cf9ce6ea4
Alwyas check for block download complete also if not localhost btc node 2018-01-20 08:44:18 -05:00
Manfred Karrer
fab97fcaf8
Show warning popup if not sufficient btc nodes or localhost btc node not synced 2018-01-19 21:58:26 -05:00
Manfred Karrer
a423c7fe86
Display localhost btc node in footer text and connection lost popup 2018-01-19 21:10:11 -05:00
Manfred Karrer
10a2b53e3a
Merge branch 'master' into dao 
# Conflicts:
#	core/src/main/java/io/bisq/core/app/SetupUtils.java
#	core/src/main/java/io/bisq/core/btc/wallet/BsqWalletService.java
#	core/src/main/java/io/bisq/core/btc/wallet/WalletService.java
#	gui/src/main/java/io/bisq/gui/bisq.css
#	gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java
#	gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java
#	gui/src/main/resources/logback.xml
#	network/src/main/java/io/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java
#	network/src/main/java/io/bisq/network/p2p/peers/getdata/RequestDataHandler.java
#	network/src/main/java/io/bisq/network/p2p/storage/P2PDataStorage.java
 2018-01-12 23:21:22 +01:00
Manfred Karrer
775e687fe5
Merge branch 'master' into TradePeriodStartsAfterConfirmation 2018-01-12 22:43:31 +01:00
Manfred Karrer
848bbdd9b1
Make tx parsing atomic by read/write lock (WIP). Add comments. 2018-01-12 18:26:33 +01:00
Manfred Karrer
d9c9345b59
Add comments. Cleanup 2018-01-12 16:48:05 +01:00
Christoph Fröschl
934d50d473 Merge branch 'Development' of https://github.com/bisq-network/exchange into Development 2018-01-10 19:25:10 +01:00
Manfred Karrer
aeec075c91
Prepare v0.6.3 2018-01-09 23:36:49 +01:00
Manfred Karrer
79e16a4b7a
Add support for start trade period timer after deposit tx has been confirmed. Not working yet. 2018-01-09 23:30:29 +01:00
Manfred Karrer
c3e648dc6b
Disable dev mode 2018-01-09 22:13:55 +01:00
Manfred Karrer
5d217aa347
Merge branch 'deeponion-master' into Development 
# Conflicts:
#	gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
#	gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
 2018-01-09 21:44:06 +01:00
Manfred Karrer
532f351b6e
Add WILD token 2018-01-09 21:36:51 +01:00
Manfred Karrer
516d130a5c
Merge branch 'Development' of https://github.com/WildCryptoICO/exchange into WildCryptoICO-Development 2018-01-09 21:34:18 +01:00
Manfred Karrer
4b9788c0bc
Change popup text for Zcoin 2018-01-09 21:30:26 +01:00
Manfred Karrer
7f0e871007
Delay callback of tx broadcaster 2018-01-09 21:15:58 +01:00
Manfred Karrer
e8fbd7a3bc
Delete tor directory (excluding hidden service folder) at startup 2018-01-09 20:18:19 +01:00
Ed Zynda III
bc6aa2eb12
Add WILD Token to currency list 2018-01-02 17:05:58 +02:00
Christoph Fröschl
f62e0fb4df changed to spaces 2017-12-30 14:51:07 +01:00
Christoph Fröschl
f671b15de5 added XIN (Infinity Economics) 2017-12-30 14:46:03 +01:00
deeponion
3c3412fe8e updated for supporting ONION 2017-12-28 00:47:50 -08:00
Manfred Karrer
86fe2c74aa
Merge branch 'feature/display-tor-connection-progress' of https://github.com/ripcurlx/exchange into ripcurlx-feature/display-tor-connection-progress 2017-12-21 00:25:36 +01:00
Manfred Karrer
cf634e2dd0
0.6.2 release candidate 2017-12-20 19:53:28 +01:00
Manfred Karrer
5ce2a67d0c
Prepare release 0.6.2 2017-12-20 01:12:18 +01:00
Manfred Karrer
7e7a06a0da
Merge branch 'jbg-add-xspec' 
# Conflicts:
#	gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
#	gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
 2017-12-19 21:22:42 +01:00
Manfred Karrer
23f13c10fe
Merge XSPEC 2017-12-19 21:22:02 +01:00
Manfred Karrer
ad8c23b294
Merge branch 'add-xspec' of https://github.com/jbg/exchange into jbg-add-xspec 2017-12-19 21:20:40 +01:00
Manfred Karrer
ab07e6c47c
Merge branch 'ibininja-master' 
# 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
 2017-12-19 21:19:26 +01:00
Manfred Karrer
f3b759046b
Merge 2017-12-19 21:18:37 +01:00
Manfred Karrer
3c0082aee5
Merge branch 'master' of https://github.com/ibininja/exchange into ibininja-master 2017-12-19 21:14:55 +01:00
Manfred Karrer
a5289460d3
Merge PR for Cage 2017-12-19 21:11:44 +01:00
Manfred Karrer
8f48e080cb
Merge branch 'master' into Development 
# Conflicts:
#	core/src/main/java/io/bisq/core/btc/BitcoinNodes.java
#	core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
#	core/src/main/java/io/bisq/core/filter/FilterManager.java
 2017-12-19 19:55:00 +01:00
Arash Ohadi
2879083c8b Fix typo 'needs' to 'need' 2017-12-19 12:24:14 +01:00
Manfred Karrer
852d4c5ba5
Add and change btc, seed and provider nodes. Use only HS nodes if tor is used for btcj 2017-12-18 23:37:32 +01:00
swordfish5975
eeceef2bb1 Cagecoin 2017-12-18 21:11:16 +10:00
swordfish5975
86370ea1cc CageCoin 2017-12-18 21:01:29 +10:00
Christoph Atteneder
4cbf518930
Show tor connection progress during app startup 2017-12-18 11:28:14 +01:00
Ibrahim MOKDAD
c6c6892e27
Updated, added true for running on eth blockchain 2017-12-17 09:34:30 +03:00
Ibrahim MOKDAD
158a6badc7
Added CryptoCurrency CRED 2017-12-17 09:03:58 +03:00
Jasper Bryant-Greene
539c767476 Added XSPEC altcoin 2017-12-11 14:21:32 +01:00
Manfred Karrer
0e16522307
Merge branch 'Development' into dao 
# Conflicts:
#	core/src/main/java/io/bisq/core/dao/blockchain/BsqNode.java
 2017-12-08 11:17:47 -05:00
Manfred Karrer
558157082d
Add filter for btc nodes 2017-12-07 23:14:34 -05:00
Manfred Karrer
b4d01ade87
Merge branch 'Development' into dao 2017-12-07 22:31:38 -05:00
Manfred Karrer
e3408ea9d1
Merge branch 'BetterUpdateWindow' into Development 2017-12-07 22:27:32 -05:00
Manfred Karrer
35b2b46d36
Add update later button. Make version lable clickable and show updates 2017-12-07 22:24:24 -05:00
Manfred Karrer
8454f4dfce
Further refactorings, cleanup, fix missing handlers. 2017-12-05 23:10:39 -05:00
Manfred Karrer
81a719d207
-Refactoring: Rename BsqChainState to BsqBlockChain 2017-12-05 16:16:34 -05:00
Manfred Karrer
57a019708d
Split list of requests in active and past. Improve tests 2017-12-05 15:01:11 -05:00
Manfred Karrer
3bcd8d4ad2
Add phase display for comp requests 2017-12-05 00:05:50 -05:00
Manfred Karrer
4e4eae8bc4
Fix BSQ tx list UI 2017-12-04 13:52:57 -05:00
Manfred Karrer
721bc6bb9f
Update parser for com request. Show comp req in btc tx list. 2017-12-02 12:05:11 -05:00
Manfred Karrer
56886693e8
Add feature for removing comp request. Add phase calculation 2017-12-01 22:13:11 -05:00
Manfred Karrer
12e1124b6d
Merge branch 'Development' into dao 
# Conflicts:
#	gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java
 2017-11-30 23:33:49 -05:00
Manfred Karrer
ea5548f2ec
Add coin selection options to withdrawal screen 2017-11-30 23:01:30 -05:00
Manfred Karrer
52d6d8adc6
Add option in withdrawal screen to include or exclude miner fee 2017-11-30 21:29:56 -05:00
Manfred Karrer
d7d5ffe9e1
Fix bugs with comp x 2017-11-30 11:22:59 -05:00
Manfred Karrer
fd386c564b
Make comp requests persistable 2017-11-30 10:00:05 -05:00
Manfred Karrer
07140889bf
Reset DevEnv flags. 2017-11-28 19:22:18 -05:00