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

9606 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph Sturm
c0d8bc7157 fix link to docs readme 2019-08-13 16:48:36 +02:00
ghubstan
4ed65c229f
Merge remote-tracking branch 'upstream/master' 
Bump guice version to 4.2.2
 2019-08-13 11:44:00 -03:00
Christoph Sturm
abf032cb22 put the jdk10 instructions in the readme for easier discovery. 2019-08-13 16:39:40 +02:00
sqrrm
3cfe510ba3
Merge pull request #3061 from christophsturm/guice-core 
also fix singleton config for core module
 2019-08-13 16:06:00 +02:00
Christoph Sturm
a8494a993a fix missing annotation 2019-08-13 15:58:14 +02:00
Christoph Sturm
c6f07ed945 singletonify the rest of the core module 2019-08-13 15:58:14 +02:00
Christoph Sturm
7500887484 even more singletoning 2019-08-13 15:58:14 +02:00
Christoph Sturm
3f097ebf63 more singletoning 2019-08-13 15:58:13 +02:00
Christoph Sturm
a4e8ec5ebf convert some of the core config 2019-08-13 15:58:13 +02:00
sqrrm
e52c255446
Merge pull request #3058 from christophsturm/bump-guice 
use singleton annotation instead of binding as singleton
 2019-08-13 15:19:41 +02:00
ghubstan
504702eb19
Merge remote-tracking branch 'upstream/master' 2019-08-13 10:17:04 -03:00
Florian Reimair
8821cdccf7
Dynamic list view sizes for DAO bonding tab 2019-08-13 12:43:40 +02:00
Florian Reimair
3018417d9b
Dynamic list view size for asset listing fee 2019-08-13 12:07:39 +02:00
Florian Reimair
637071c956
Dynamic list view size in Dao network monitor view 2019-08-13 11:44:47 +02:00
Florian Reimair
7e7d956f05
Dynamic list view size in accounts view 2019-08-13 11:22:08 +02:00
sqrrm
66b1f17b7c
Merge pull request #3076 from freimair/fix_popup 
Update trading amount on Error to prevent popup loop
 2019-08-13 10:12:54 +02:00
Florian Reimair
6ea0c50752
Update trading amount to prevent popup loop 2019-08-12 19:16:42 +02:00
ghubstan
623a1db1e7
Fix merge conflict 
Bump netlayerVersion to  0.6.5.1
 2019-08-09 14:49:12 -03:00
ghubstan
2709e61875
Merge remote-tracking branch 'upstream/master' 2019-08-09 14:45:57 -03: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
zero24x
a8506a16cc Add coin VARIUS 2019-08-09 12:22:38 +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
camthegeek
f4cba8ccc1 list Masari 2019-08-06 17:09:31 -04:00
ghubstan
5f3d7f52c2
Merge remote-tracking branch 'upstream/master' 2019-08-06 14:27:38 -03:00
Christoph Sturm
e418d5bb09 update witness file for new guice version 2019-08-06 17:46:35 +02:00
Christoph Sturm
643c0daef0 use singleton annotation instead of binding as singleton. 
this is the correct way to do it. the way it is currently done means
that if a component is not declared in a module, guice still finds it
but does not use the singleton lifecycle

binding as singleton in the module is meant to be used for classes that
we don't have the sourcecode for (i.e. jdk classes)
 2019-08-06 17:44:47 +02:00
Christoph Sturm
aa4813d7b1 don't fail if there is no shutdown hook. 2019-08-06 17:44:47 +02:00
Christoph Sturm
20e011178e bump guice version and start testing desktop guice setup 2019-08-06 17:44:47 +02:00
Niyi Dada
b4f79f2e73 Fixed column indexing. 2019-08-06 11:35:59 +01:00