Commit Graph

133 Commits

Author SHA1 Message Date
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
Christoph Atteneder
68fb1163a3
Add Java 10 configuration for merged repositories 2018-09-17 13:37:03 +02:00
Christoph Atteneder
3de0a8b964
Merge seednode repository at eedf81c 2018-09-14 11:51:34 +02:00
Chris Beams
86f4df4122
Move seednode module to new repository
This module is being extracted into its own repository, which will live
at https://github.com/bisq-network/bisq-seednode.
2018-03-08 14:28:34 +01:00
Manfred Karrer
b7064f9820
Add option key for dev mode 2018-03-05 11:10:00 -05: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
644312a472
Add useDevPrivilegeKeys to other app base module 2018-02-26 12:52:42 -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
Bernard Labno
fe1edafbd8 Dockerize seednode for development mode 2018-02-20 17:58:06 +01: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
Manfred Karrer
bf244856b1
v0.6.5 2018-01-31 13:04:24 -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
Manfred Karrer
33eecd81aa
Release 0.6.4 2018-01-20 20:47:53 -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
aeec075c91
Prepare v0.6.3 2018-01-09 23:36:49 +01:00
Manfred Karrer
39890ea4d0
Adjust pom for bouncycastle 2018-01-04 22:50:43 +01:00
Manfred Karrer
307b936082
Fix Monitor issues with error reports. Improve logging. 2018-01-03 15:55:59 +01:00
Manfred Karrer
ea4b926a8c
Change mvn plugin version 2017-12-20 12:48:13 +01:00
Manfred Karrer
510147822f
Update version nr for seed, provider and statistic nodes. Cleanup 2017-12-20 03:27:19 +01:00
Manfred Karrer
58d8ab032e
Remove exclusion of bouncycastle in pom. 2017-12-20 00:49:01 +01:00
Manfred Karrer
41a4ca93e7
Improve error msg for withdrawal. Refactor: Rename TIMEOUT variables. 2017-12-19 23:27:43 +01:00
Manfred Karrer
ef8796be3c
Update seednode version to 0.6.2 2017-12-17 21:21:19 +01:00
Manfred Karrer
0b612a0a9d
Update version nr for seed and provider nodes 2017-12-16 00:14:21 +01:00
Manfred Karrer
b4d01ade87
Merge branch 'Development' into dao 2017-12-07 22:31:38 -05:00
Manfred Karrer
5117fa93f0
Improve maxMemory check and restart process 2017-12-07 22:22:15 -05:00
Manfred Karrer
fd386c564b
Make comp requests persistable 2017-11-30 10:00:05 -05:00
Manfred Karrer
e071653651
Add new flag to DevEnv 2017-11-27 22:17:23 -05:00
Manfred Karrer
e3c9f150f5
Clean up 2017-11-26 16:35:47 -05:00
Manfred Karrer
07d85b3f8b
Set version 0.6.1. Add versions for seed and statistics nodes 2017-11-24 14:23:49 -05:00
Manfred Karrer
d99461deee
Use new data structure for TradeStatistics 2017-11-15 19:22:11 -05:00
Manfred Karrer
677d7dc477
Set v0.6.0 2017-11-08 11:11:51 -05:00
Manfred Karrer
fa2b14ba0c
Add default bridges from Tor browser and UI 2017-11-04 22:46:06 -05:00
Manfred Karrer
afaabf9e36
Add support of seed and price rleay node filters. Use guice in P2P network domain classes. 2017-10-26 15:46:48 -05:00
Manfred Karrer
5cd47a610f
Remove space 2017-10-19 10:41:22 -05:00
Mike Rosseel
5ddec3e4f2
Dockerfile for a hidden service seednode
Adds Dockerfile and docker-compose.yml files to easily build a new
seednode from the latest master branch. The Dockerfile assumes you
have a hostname and private_keys.
Also small fixes to SeedNode/SeedNodeMain.

Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-10-19 14:33:43 +02:00
Manfred Karrer
01cf823d7a
Prepare merge Dev 2017-10-11 07:21:50 -05:00
Manfred Karrer
2d6fa2be6f Move removeCryptographyRestrictions method to Utilities and add static initializer to SeedNodeMain, ProviderMain and StatisticsMain 2017-07-27 17:12:14 +02:00
Manfred Karrer
a7f3d68cb1 Version 0.5.3 with hotfix for fixing wrong app data name (bisq was renamed to Bisq -> we rename the app data dir). 2017-07-17 10:05:08 +02:00
Manfred Karrer
484b5411b9 use lower case for log file 2017-07-16 20:24:17 +02:00
Manfred Karrer
b1dc97eb7d Add bouncycastle as lib to other jar builds 2017-07-16 17:45:53 +02:00
Manfred Karrer
b7d8a0acb6 set version 0.5.2 2017-07-16 16:29:10 +02:00
Manfred Karrer
2a55758d3b Merge branch 'Development' into 0.5.2 2017-07-14 11:42:16 +02:00
Manfred Karrer
6bbac2903b Change version nr back to 0.5.1 (0.5.2 is not ready yet) 2017-07-14 11:41:20 +02:00
Manfred Karrer
45720486b2 Use Bisq instead of bisq 2017-07-11 22:37:44 +02:00
cedric.walter
ec6dc25195 fixed maven transitive dependencies, do not use ${project.parent.version} but ${project.version} with this change you can now run test without installing first all artifacts to local repository! test now run before install as expected and with current code version of ide/reactor 2017-07-08 21:40:16 +02:00
Manfred Karrer
e68f4219c6 v0.5.2 2017-07-03 12:18:14 +02:00
Manfred Karrer
570549bfd1 v0.5.1 2017-07-01 00:32:06 +02:00
Manfred Karrer
e258b17e7a Update license with Bisq instead of bisq 2017-06-27 01:39:11 +02:00