ghubstan
5f3d7f52c2
Merge remote-tracking branch 'upstream/master'
2019-08-06 14:27:38 -03:00
sqrrm
276a506122
Merge pull request #3043 from christophsturm/test-guice-setup-and-fix
...
Test guice setup and fix
2019-08-05 13:53:55 +02:00
ghubstan
3f7795b926
Define missing dependency version variables
...
Created version variables in build.gradle where missing,
but not touching hard coded overrides in subprojects.
Alphanumerically ordered version variables.
Used IDE code formatter, changing top line of file.
2019-08-03 16:00:55 -03:00
Christoph Sturm
f96edd2723
create key directory if it does not exist
2019-08-01 16:20:26 +02:00
Christoph Sturm
18115c98f2
Update build.gradle
...
Co-Authored-By: sqrrm <sqrrm@users.noreply.github.com>
2019-08-01 13:44:07 +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
sqrrm
47c7910e88
Move Clock binding to P2PModule
2019-08-01 11:43:43 +02:00
Christoph Atteneder
2590ef972b
Merge pull request #3024 from christophsturm/adoptopenjdk
...
mention how to use Adoptopenjdk to build
2019-08-01 09:33:38 +02:00
sqrrm
360dc0b4e8
Merge pull request #3037 from christophsturm/inject-clock
...
inject clock for usage in isDateInTolerance
2019-07-30 16:12:48 +02:00
sqrrm
7acee4fe9b
Merge pull request #3034 from christophsturm/christoph-improve-test
...
improve the signedwitnessservicetest
2019-07-30 16:08:22 +02:00
Christoph Sturm
de01018368
remove empty lines
2019-07-30 15:42:12 +02:00
Christoph Sturm
8d0a9b38ba
make test nicer
2019-07-30 15:40:17 +02:00
Christoph Sturm
c715aa2d5d
start unit testing SignedWitness
2019-07-30 15:40:17 +02:00
Christoph Sturm
022534643e
rename
2019-07-30 15:40:08 +02:00
Christoph Sturm
c38ef06d04
inject clock for usage in isDateInTolerance
2019-07-30 15:27:32 +02:00
Christoph Sturm
e62e718d89
make local what can be local
2019-07-30 13:07:12 +02:00
Christoph Sturm
00c0168aea
inline test method and simplify
2019-07-30 13:07:12 +02:00
Christoph Sturm
2f26140b6d
fix warnings
2019-07-30 13:07:12 +02:00
Christoph Sturm
9f54f480e6
move all init code to setUp
2019-07-30 13:07:12 +02:00
sqrrm
3f5b0ca72d
Merge pull request #3030 from christophsturm/cherry-pick-signing
...
Cherry pick non ui commits from #2872
2019-07-30 12:33:14 +02:00
Christoph Atteneder
ec6c23d09d
Improve documentation
2019-07-30 11:41:30 +02:00
Christoph Atteneder
d0d819221d
Remove old TODO and remove unused duplicate constant for safe account age date
2019-07-30 11:41:02 +02:00
Christoph Atteneder
5dc321cc43
Change scope of safe account age point in time as long as it is not used anywhere else
2019-07-30 11:40:20 +02:00
Christoph Atteneder
aa2e3eadcc
Fix typos
2019-07-30 11:39:42 +02:00
Christoph Atteneder
fdf5364c47
Add domain layer for signed account age witnesses (credits ManfredKarrer and oscarguindzberg)
2019-07-30 11:38:57 +02:00
sqrrm
4b235dbadb
Merge pull request #3007 from christophsturm/christoph/deprecate-pb-fields
...
mark outdated fields as deprecated
2019-07-30 10:26:12 +02:00
Christoph Atteneder
0105290ead
Merge pull request #2892 from fflo/master
...
List SixEleven (611)
2019-07-30 10:08:50 +02:00
Christoph Atteneder
3f089134df
Merge pull request #3028 from bisq-network/hotfix-for-v1.1.3
...
v1.1.4
2019-07-29 19:32:04 +02:00
Christoph Atteneder
db25293d62
Merge branch 'master' of github.com:bisq-network/bisq into hotfix-for-v1.1.3
...
# 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-07-29 19:00:37 +02:00
sqrrm
06e7b2fb85
Merge pull request #3023 from christophsturm/christoph/force-jdk10
...
force jdk 10 on build to avoid confusion when some tests fail.
2019-07-29 16:36:27 +02:00
Christoph Sturm
60d5b4ec5a
fix type
2019-07-29 15:44:37 +02:00
Christoph Sturm
14f1580c8a
add comment
2019-07-29 15:44:24 +02:00
Christoph Atteneder
d7cdd4be5c
Revert to SNAPSHOT version
2019-07-29 15:41:41 +02:00
sqrrm
a2e02acddc
Merge pull request #3027 from christophsturm/generics-fix2
...
fix generics warning
2019-07-29 15:29:51 +02:00
Christoph Sturm
ae254ec742
Bisq
2019-07-29 15:14:52 +02:00
Christoph Sturm
fd56699f52
fix generics warning
2019-07-29 15:10:50 +02:00
sqrrm
2570e9b728
Merge pull request #2999 from christophsturm/christoph/rename-clock
...
rename Clock to ClockWatcher
2019-07-29 14:39:22 +02:00
Christoph Atteneder
cec7d780c7
Update translations
2019-07-29 11:36:28 +02:00
Christoph Sturm
e35f73b870
mention how to use Adoptopenjdk to build
2019-07-29 11:35:43 +02:00
J. Maurice
6eaa2e0072
Add Japanese translations
2019-07-29 11:33:25 +02:00
Christoph Atteneder
366314eec8
Merge pull request #2 from sqrrm/checkpointing
...
Add checkpoint at block 586920
2019-07-29 11:22:53 +02:00
Christoph Sturm
a3c814797d
force jdk 10 on build to avoid confusion when some tests fail.
2019-07-29 09:53:19 +02:00
sqrrm
50f350445c
Add checkpoint at block 586920
...
A checkpoint at block 586920 with hash
523aaad4e760f6ac6196fec1b3ec9a2f42e5b272 to avoid that clients in
a corrupt state continue running.
Ignore checkpointing if ignoreDevMsg is set
2019-07-28 20:32:19 +02:00
sqrrm
70b7660e6c
Merge pull request #3005 from christophsturm/christoph/split-pb
...
split the pb.java file into multiple files
2019-07-26 16:14:57 +02:00
sqrrm
8abfdab469
Merge pull request #3004 from christophsturm/christoph-logging-fix
...
fix format string
2019-07-26 15:09:49 +02:00
sqrrm
514f5e40a5
Merge pull request #3002 from devinbileck/update-seed-operator
...
Reflect change in operator for seed node jhgcy2won7xnslrb
2019-07-26 15:08:36 +02:00
sqrrm
38023d0ffb
Merge pull request #3008 from huey735/patch-3
...
Correct "County" typo
2019-07-26 15:07:15 +02:00
Christoph Atteneder
d498e43415
Bump version number
2019-07-26 10:41:47 +02:00
Christoph Atteneder
4c8a0ea00b
Update data stores
2019-07-26 10:35:48 +02:00
