Commit Graph

169 Commits

Author SHA1 Message Date
sqrrm
ace881cc04
Fix test, add singleton check for ChargeBackRisk 2019-08-27 12:47:02 +02:00
Christoph Atteneder
89073316c9
Merge branch 'master' of github.com:bisq-network/bisq into hotfix-v1.1.5
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
2019-08-08 11:19:51 +02:00
Christoph Atteneder
3bf3ff83b9
Bump version number 2019-08-08 09:54:54 +02:00
Christoph Sturm
0698e3194d test all of it 2019-08-01 13:14:42 +02:00
Christoph Sturm
ba1d493caf test the seednode's guice setup 2019-08-01 13:12:37 +02:00
Christoph Atteneder
d498e43415
Bump version number 2019-07-26 10:41:47 +02:00
Christoph Atteneder
59be5bc94e
Bump version number 2019-07-15 16:33:55 +02:00
Florian Reimair
06d21865b6
Added systemd.service for seednode operation 2019-07-05 09:19:42 +02:00
Florian Reimair
03db522a11
Remove restart-mechanism from seed node 2019-07-05 09:19:42 +02:00
Christoph Atteneder
ca24ce0217
Bump version number 2019-06-04 10:49:00 +02:00
Christoph Atteneder
ac68da1dd3
Bump version number 2019-05-06 10:47:01 +02:00
Christoph Atteneder
8ceb2e3be2
Bump version number 2019-05-03 12:13:41 +02:00
Manfred Karrer
a677a5b1a2
Always use AppSetupWithP2PAndDAO independent of isDaoFullNode 2019-04-16 17:59:06 -05:00
Christoph Atteneder
bdf163ca2d
Bump version number 2019-04-16 16:03:12 +02:00
Christoph Atteneder
2c106c74c6
Bump version number 2019-04-12 12:09:49 +02:00
Christoph Atteneder
f9a0dd1502
Bump version number 2019-04-08 12:10:59 +02:00
Christoph Atteneder
0ffc93a091
Bump version number 2019-04-02 17:13:04 +02:00
Christoph Atteneder
fb3c8c214e
Bump version number 2019-04-02 11:19:03 +02:00
Florian Reimair
ede3a3c721
Introduced Capabilities.addAll 2019-03-18 12:55:19 +01:00
Florian Reimair
7a03aba02e
Refactor Capabilities for Connection 2019-03-18 12:29:09 +01:00
Manfred Karrer
03023d6338
Remove myAddress from docs and scripts as it is not used/needed anymore 2019-03-08 10:58:53 -05:00
Manfred Karrer
73eea7927a
Merge pull request #2469 from freimair/refactor_capabilities
Refactor capabilities and other P2P-related stuff
2019-03-06 18:38:23 -05:00
Christoph Atteneder
75fd991b3b
Bump version number 2019-03-06 10:04:50 +01:00
Florian Reimair
00872427de
Get rid of Capability ordinals
github.com/AlDanial/cloc v 1.80  T=0.19 s (5.3 files/s, 5.3 lines/s)
-------------------------------------------------------------------------------
                             files          blank        comment           code
-------------------------------------------------------------------------------
 same                            0              0            913           3405
 modified                       28              0              6            145
 added                           1             18             36             58
 removed                         0              9              3            103
-------------------------------------------------------------------------------
2019-03-06 09:29:26 +01:00
Christoph Atteneder
d31173bc4f
Update version number for v0.9.4 2019-02-21 22:34:36 +01:00
Christoph Atteneder
b18a143c0c
Bump version number 2019-01-08 19:54:33 +01:00
Christoph Atteneder
d6543377cf
Bump version number 2019-01-08 16:37:28 +01:00
Christoph Atteneder
50d4c6c1fc
Bump version number 2018-12-13 13:59:08 +01:00
Manfred Karrer
de54518839
Set version 0.9.0 2018-12-03 00:38:44 +01:00
Chris Beams
931f369fb6
Include executable name and version in help output 2018-11-24 13:24:03 +01:00
Chris Beams
b0886dd02d
Pull up remaining seednode config to root 2018-11-04 18:00:10 +01:00
Chris Beams
bd1e7e273f
Pull up application plugin config to root 2018-11-04 16:27:52 +01:00
Chris Beams
1cdb39ab60
Pull up JesusMcCloud repo to root
Not all subprojects need it, but most do.
2018-11-04 14:28:14 +01:00
Chris Beams
4e1fa914a2
Pull up common repositories to root build.gradle 2018-11-04 14:20:55 +01:00
Chris Beams
95c8b8ddfa
Pull up application and configuration of java plugin 2018-11-04 14:20:55 +01:00
Chris Beams
3c1c402d40
Remove use of maven plugin
It is no longer necessary to publish Maven metadata about common, core
and other submodules as they are no longer managed as separate libraries
in separate repositories. The only way these modules should be getting
referenced is from within applications in this repository such as
desktop, statsnode, etc. Essentially, we're no longer publishing our
libraries for public consumption.
2018-11-04 13:19:06 +01: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
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