mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity
9316 commits 3 branches 150 tags 4.1 GiB
Commit graph

9316 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Reimair
7e7d956f05
Dynamic list view size in accounts view 2019-08-13 11:22:08 +02:00
sqrrm
b1ebe071ed
Merge pull request #3045 from freimair/monitor-bsqblocks 
Monitor fixes
 2019-08-09 17:47:20 +02:00
Florian Reimair
bc73844619
Refactor exception handling 2019-08-09 17:16:11 +02:00
sqrrm
89072d941f
Merge pull request #3048 from freimair/tor_0.4.0.5 
Update Tor to 0.4.0.5
 2019-08-09 15:59:24 +02:00
sqrrm
fb1c96d24c
Merge pull request #2976 from niyid/master 
Fixes for issues #2741, #2944, #2955
 2019-08-09 15:35:21 +02:00
sqrrm
1c5c633f80
Merge pull request #3009 from niyid-bisq/master 
Fix for issue 1896
 2019-08-09 15:34:21 +02:00
sqrrm
b92b4becfb
Merge pull request #3040 from bisq-2106-2/master 
Fix for #2106
 2019-08-09 15:32:50 +02:00
sqrrm
5a77089a1a
Merge pull request #3065 from bisq-network/hotfix-v1.1.5 
Hotfix v1.1.5
 2019-08-08 12:06:46 +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
a56b367476
Revert to SNAPSHOT version 2019-08-08 10:34:06 +02:00
Christoph Atteneder
3bf3ff83b9
Bump version number 2019-08-08 09:54:54 +02:00
Christoph Atteneder
ee39e831ea
Update bitcoinj checkpoint file 2019-08-08 09:45:33 +02:00
Christoph Atteneder
8164116c86
Update bitcoinj checkpoint file 2019-08-08 09:44:37 +02:00
sqrrm
08a34e6cf8
Don't force close on checkpoint fail 2019-08-08 09:41:03 +02:00
Christoph Atteneder
dd62ddd6fc
Merge pull request #3064 from sqrrm/allow-ignore-checkpoint 
Don't force close on checkpoint fail
 2019-08-08 09:40:38 +02:00
sqrrm
9b5050b1c9
Update resources 2019-08-07 23:21:09 +02:00
sqrrm
398f173981
Don't force close on checkpoint fail 2019-08-07 23:19:21 +02:00
Christoph Atteneder
1f7a244506
Merge pull request #3063 from sqrrm/update-resources 
Update resources
 2019-08-07 23:17:42 +02:00
sqrrm
a0bba5d716
Check that proposal is in correct cycle 2019-08-07 23:13:54 +02:00
sqrrm
62cfaf09c3
Update resources 2019-08-07 23:08:21 +02:00
Christoph Atteneder
c86241abeb
Update translations 2019-08-07 22:53:06 +02:00
Christoph Atteneder
a1bc159df0
Update translations 2019-08-07 22:43:09 +02:00
sqrrm
21514da7e0
Merge pull request #3062 from sqrrm/fix-parsing 
Check that proposal is in correct cycle
 2019-08-07 21:19:10 +02:00
sqrrm
26329281ec
Check that proposal is in correct cycle 2019-08-07 20:12:20 +02:00
Niyi Dada
b4f79f2e73 Fixed column indexing. 2019-08-06 11:35:59 +01: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
Florian Reimair
ad0724b97d
Update tor to 0.4.0.5 2019-08-02 13:45:53 +02:00
Christoph Sturm
f96edd2723 create key directory if it does not exist 2019-08-01 16:20:26 +02:00
Niyi Dada
d12a6c2e0f Reformatting completed. 2019-08-01 13:11:38 +01:00
Christoph Sturm
18115c98f2
Update build.gradle 
Co-Authored-By: sqrrm <sqrrm@users.noreply.github.com>
 2019-08-01 13:44:07 +02:00
Niyi Dada
09369c6043 Reformatting. 2019-08-01 12:29:05 +01: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
Niyi Dada
0fffbe670e Columns added to export but hidden from view table. 
- Transaction Fee
 - Maker Fee
 - Buyer Deposit
 - Seller Deposit
 2019-07-31 22:55:22 +01:00
Niyi Dada
11f4fe3ffc Revert "Issue #1896 fixed." 
This reverts commit 363f2e9760.
 2019-07-31 15:25:13 +01: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