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
Chris Beams
31564e923c
Update doc/CONTRIBUTING.md to request PRs on master
...
This doc should be removed in favor of the root-level CONTRIBUTING.md,
but this can be done later; this is just a quick fix to make sure we've
gotten rid of all references to the `Development` branch.
2018-01-23 09:45:13 +01:00
Manfred Karrer
046cf513ec
Merge branch 'Development' into dao
2017-12-07 12:33:14 -05:00
Manfred Karrer
feb71581ce
Merge pull request #1069 from ripcurlx/patch-2
...
Fix markdown formatting
2017-12-07 11:12:42 -05:00
Christoph Atteneder
dcf91619d4
Fix markdown formatting
2017-12-07 11:58:41 +01:00
Christoph Atteneder
fce7b0a6b0
Update wrong package path
2017-12-07 11:41:45 +01:00
Manfred Karrer
81a719d207
-Refactoring: Rename BsqChainState to BsqBlockChain
2017-12-05 16:16:34 -05:00
Manfred Karrer
ee98808436
Merge branch 'Development'
...
# Conflicts:
# provider/src/main/java/io/bisq/provider/price/providers/BtcAverageProvider.java
2017-11-16 10:39:08 -05:00
O. Libre
b35fede2e4
Install package openjfx instead of libopenjfx-java
...
On Ubuntu 17.10, installing `libopenjfx-java` was not sufficient
producing a build error because could not find `openjfx`.
Build succeeded after install of package `openjfx`.
Package `openjfx` depends on `libopenjfx-java` (and `openjdk-8-jre`)
2017-11-04 18:00:04 +01:00
O. Libre
5c4f8a11d5
Propose JAVA_HOME=/usr/lib/jvm/default-java
...
The command line update-alternatives --config java
changes the symbolic links /usr/lib/jvm/default-java
in order to switch to another installed JDK.
From my knowledge, I know three different path:
* /usr/lib/jvm/default-java since Ubuntu 16.10
* /usr/lib/jvm/default for Arch
* /usr/lib/jvm/java for Fedora
2017-11-03 22:55:23 +01:00
Manfred Karrer
49e38a6c86
Fix format
2017-10-25 14:22:46 -05:00
Manfred Karrer
e8290e3b8a
Fix missing verifications, handle altcoins, cleanup
2017-10-25 14:18:26 -05:00
Manfred Karrer
96fe221eac
Fix path in build.md
2017-10-20 19:00:13 -05:00
Manfred Karrer
f9635cd7e1
Fix old github repo address
2017-10-20 18:50:31 -05:00
Manfred Karrer
b72d716910
Merge Development
2017-09-17 11:28:34 -05:00
Manfred Karrer
a7c0f1d16f
Merge branch 'Development' into DAO_phase1
2017-08-09 12:48:56 +02:00
Manfred Karrer
e8c46c9709
Merge branch 'master' into Development
...
# Conflicts:
# doc/build.md
2017-08-09 12:48:07 +02:00
Chris Beams
ae05c015b9
Consume custom bitcoinj/libdojh/btcd deps via JitPack ( #899 )
...
This change removes the need to clone and build bisq's forks of
bitcoinj, libdohj and btcd-cli4j in order to build bisq itself.
2017-08-09 12:13:47 +02:00
Manfred Karrer
667ad0bc95
Update btc conf file with stricter access
2017-07-27 19:48:37 +02:00
Manfred Karrer
53de6ee4ad
Append bisq to check out command
2017-07-27 11:51:15 +02:00
Manfred Karrer
4ee0ebe127
Add command for git checkout of bisq
2017-07-27 11:50:35 +02:00
Manfred Karrer
73e9c66a12
Add note for lombok plugin
2017-07-25 15:47:39 +02:00
Manfred Karrer
5e9cf8cf7f
Update doc
2017-07-16 15:24:40 +02:00
Manfred Karrer
ec3f610a5b
Update doc
2017-07-11 20:12:35 +02:00
Manfred Karrer
c89b8bb91f
Fix build doc dir, argument references
2017-07-10 23:39:35 +02:00
cedric.walter
76a8e53fe0
removed need to set unlimited cipher strength, use reflection to set java policy in code, hopefully something we can removed soon when using jdk 9 (-dcrypto.policy=unlimited will be enough).
2017-07-08 21:06:36 +02:00
cedric.walter
692bc1a837
added dependency management for all bouncycastle dependencies, these jar are signed and can not be placed in shaded jar, copy them in a lib directory that will be use by shaded.jar classloader
2017-07-08 21:03:13 +02:00
cedric.walter
cdb545f390
removed the need to install protobuf dependenciy as root before building Bisq, more maven way of doing
2017-07-08 18:36:30 +02:00
Mike Rosseel
9e76d22aa3
add protobuffer install on linux to docs
2017-07-03 13:09:17 +02:00
Manfred Karrer
41efa7c625
Update build script for protoc installation
2017-07-03 13:07:45 +02:00
Manfred Karrer
e1e8c4a428
Update app icons and build scripts
2017-06-27 02:50:31 +02:00
Manfred Karrer
f268abe2e1
Merge DAO branch to Development branch
2017-06-27 01:30:24 +02:00
Manfred Karrer
e2fa679a68
Merge DAO branch to Development branch
2017-06-27 01:29:54 +02:00
Manfred Karrer
71f98a5d28
Update install script
2017-02-11 18:18:41 -05:00
Manfred Karrer
8b25b59f39
Add install instruction for java on linux
2017-02-09 22:09:05 -05:00
Manfred Karrer
f6c4ac9143
Use jdk 1.8.0_121, update build scripts
2017-02-07 18:46:11 -05:00
Manfred Karrer
d88aceddf8
Clean up, add missing coins (LTBcoin, SFSC)
2017-02-07 10:05:15 -05:00
Manfred Karrer
7f978832fe
Add Contributing notes
2017-01-03 12:29:18 +01:00
Manfred Karrer
aeb72b26da
update dev scripts
2016-11-19 18:07:44 +01:00
Manfred Karrer
9ab423619c
Update BitcoinJ to 0.13.1.7
2016-11-19 14:31:41 +01:00
Manfred Karrer
4dbd3a03c8
Rename btcSeedNodes prog. arg to btcNodes
2016-11-14 15:17:05 +01:00
Manfred Karrer
00f17c6d14
Add log for trade state, improve install doc
2016-11-12 12:50:49 +01:00
Manfred Karrer
9440ecdf7d
Merge branch 'master' into Development
2016-10-28 18:26:32 +02:00
Manfred Karrer
b6948f9523
Add install comments
2016-10-28 18:26:13 +02:00
Manfred Karrer
f9a7d2c837
Set default value for insertPubKey flag to false. Update to BitcoinJ version 0.13.1.6
2016-10-25 03:53:45 +02:00
Rob Judd
402208f48b
Fix documentation Java version 112 iss #657
2016-10-20 19:15:44 +10:00
Manfred Karrer
0a28cefff6
Require min. java verison 1.8.0_122 (includes SortedList bugfix)
2016-10-19 16:54:46 +02:00
Manfred Karrer
f076a840f5
Remove jdkfix module (new jdk version 8_u_122 includes the SorteList bugfix)
2016-10-19 16:53:06 +02:00
Rob Judd
62661212f2
Crypto security update
2016-10-19 15:38:53 +10:00
Manfred Karrer
8236a21348
Merge branch 'master' into Development
...
Conflicts:
doc/build.md
2016-10-18 20:45:59 +02:00
