Commit graph

3392 commits

Author SHA1 Message Date
Manfred Karrer
d4867f712a Fix null pointer 2017-07-11 15:28:01 +02:00
Manfred Karrer
e2af215a57 Set txOutputType default to TxOutputType.UNDEFINED instead of null 2017-07-11 15:27:47 +02:00
Manfred Karrer
8371363c96 Merge branch 'Development' into 0.5.2 2017-07-10 23:42:19 +02:00
Manfred Karrer
7fde9a17b4 Merge branch 'master' into Development 2017-07-10 23:41:54 +02:00
Manfred Karrer
45774d3177 Merge pull request #864 from cedricwalter/fix-protobuf-permissions
used ant-exec to fix permissions instead of maven assembly
2017-07-10 23:40:51 +02:00
Manfred Karrer
c89b8bb91f Fix build doc dir, argument references 2017-07-10 23:39:35 +02:00
cedric.walter
e62f7435a8 last fix for mac 2017-07-10 21:52:00 +02:00
cedric.walter
2d91e4118e fixed for macos, avoid having unix profile active on macos 2017-07-10 21:37:39 +02:00
cedric.walter
06c90b46c4 tigthened permissions 2017-07-10 20:17:39 +02:00
cedric.walter
46aaa7c51e switch off again tests 2017-07-10 20:17:02 +02:00
cedric.walter
59edcefdc4 used ant-exec to fix permissions instead of maven assembly 2017-07-10 19:58:50 +02:00
Manfred Karrer
6b2f3aeb10 Move seting of default locale to static initializer 2017-07-10 17:22:01 +02:00
Manfred Karrer
be8703fdac Move check for peer address after message type check 2017-07-10 16:58:28 +02:00
Manfred Karrer
fc9acb4eb4 Fix check if onMessage at connection is matching requested peer address 2017-07-10 16:55:27 +02:00
Manfred Karrer
67134651ee Improve log 2017-07-10 16:53:45 +02:00
Manfred Karrer
1603e01bfc Merge branch 'Development' into DAO_phase1 2017-07-10 13:00:56 +02:00
Manfred Karrer
47e2f0a30f Fix nullpointers 2017-07-10 12:57:11 +02:00
Manfred Karrer
b66d52fe01 Handle seedNodes not available state 2017-07-10 12:57:01 +02:00
Manfred Karrer
4ebcb79a21 Remove dev flags 2017-07-10 12:44:10 +02:00
Manfred Karrer
bda069fd17 Fix null pointers 2017-07-10 12:42:54 +02:00
Manfred Karrer
f27f892cd9 Merge branch 'master' into DAO_phase1 2017-07-09 23:10:23 +02:00
Manfred Karrer
77f8bdb7b0 Merge branch 'master' into DAO_phase1 2017-07-09 23:07:04 +02:00
Manfred Karrer
b675592c5d Merge pull request #862 from cedricwalter/fix-protobuf-permissions
Fix protobuf permissions
2017-07-09 23:06:22 +02:00
cedric.walter
fd8a09f28e fixed permissions of protobuf.exe to r-x------ 2017-07-09 20:45:37 +02:00
Manfred Karrer
75bf94fae0 Change tx fee policy in provider 2017-07-09 03:36:55 +02:00
Manfred Karrer
a0e2818ef4 Merge branch 'master' into Development 2017-07-09 02:01:42 +02:00
Manfred Karrer
2844cdece3 Merge pull request #860 from cedricwalter/fix-maven-transitive-dependency
Fix maven transitive dependency
2017-07-08 22:12:35 +02:00
Manfred Karrer
1573671d9e Merge pull request #859 from cedricwalter/remove-bouncy-castle-copy
Remove bouncy castle copy
2017-07-08 22:11:08 +02:00
Manfred Karrer
b70a5a51e8 Merge pull request #858 from cedricwalter/fix-travis-build
Installing protobuf automagically
2017-07-08 21:51:36 +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
cedric.walter
d6a0bdd4dd corrected a typo but did not change hash, (previous version was org.bouncycastle:bcprov-jdk15on:1.52🫙null:compile), now org.bouncycastle:bcprov-jdk15on:1.56🫙null:compile with a different hash 2017-07-08 21:27:33 +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
5d05326991 ignored a test unit not having any test, added TODO and IGNORE 2017-07-08 19:11:03 +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
cedric.walter
8457802943 added code to activate unlimited cipher strength when using jdk 9 2017-07-08 16:39:12 +02:00
Manfred Karrer
7a8e99d7b1 Apply Protobuffer to DAO data 2017-07-08 01:36:35 +02:00
Mike Rosseel
e864bc92b7 Merge branch 'downloadUpdates' of github.com:bitsquare/bitsquare into downloadUpdates
Conflicts:
	.idea/codeStyleSettings.xml
2017-07-07 17:45:13 +02:00
Mike Rosseel
55be62bc25 rebase problem 2017-07-07 17:44:36 +02:00
Mike Rosseel
95fb2dcebf download update is code complete 2017-07-07 17:37:47 +02:00
Mike Rosseel
1b01ea7cfd rebase of downloadUpdates branch by Simon Tuberlin on the Development HEAD
- rebase conflicts due to package renames
- some bouncy castle pgp stuff changed with new releases
2017-07-07 17:35:33 +02:00
SimonTuberlin
85cbd39a33 Sig verification for multiple keys
but download somehow does not work anymore :s
TODO: Open download folder, give qualified report about signatures
2017-07-07 17:35:33 +02:00
SimonTuberlin
5ac1ba2e88 Download to tmpdir works, can be cancelled by closing update alert, and shows directory upon completion (only tested on Linux) 2017-07-07 17:35:33 +02:00
SimonTuberlin
fb5869602e Ready for first message/download test 2017-07-07 17:35:33 +02:00
SimonTuberlin
fac57c74f7 Prepared DownloadUtil task and updateAlert window 2017-07-07 17:35:33 +02:00
Mike Rosseel
2f4ef841bf rebase of downloadUpdates branch by Simon Tuberlin on the Development HEAD
- rebase conflicts due to package renames
- some bouncy castle pgp stuff changed with new releases
2017-07-07 17:35:17 +02:00
SimonTuberlin
3e895f45e4 Sig verification for multiple keys
but download somehow does not work anymore :s
TODO: Open download folder, give qualified report about signatures
2017-07-07 17:35:17 +02:00
SimonTuberlin
5a8235008a Download to tmpdir works, can be cancelled by closing update alert, and shows directory upon completion (only tested on Linux) 2017-07-07 17:35:17 +02:00
SimonTuberlin
204e4c4409 Ready for first message/download test 2017-07-07 17:35:17 +02:00
SimonTuberlin
fc01f797f0 Prepared DownloadUtil task and updateAlert window 2017-07-07 17:35:16 +02:00