Commit Graph

9369 Commits

Author SHA1 Message Date
sqrrm
74fc76db87
Merge pull request #3097 from battleofwizards/bump-protobuf-to-fix-warning
Update protobuf to fix annoying warnings
2019-08-16 18:17:08 +02:00
sqrrm
f947340f2b
Merge pull request #3098 from battleofwizards/gui-texts-replace-p2p-with-bisq
Replace "P2P network" with "Bisq network" in GUI
2019-08-16 18:16:41 +02:00
sqrrm
02def6e698
Merge pull request #3099 from battleofwizards/enhance-documentation-on-translation-process
Enhance docs/translation-process.md
2019-08-16 18:14:30 +02:00
sqrrm
c0b4a86a2a
Merge pull request #3100 from ghubstan/tidy-build-file
Define more version variables, fix style problems
2019-08-16 18:14:09 +02:00
ghubstan
7b2ba53b66
Define more version variables, fix style problems
Define fontawesomefx version variables.

Fix testCompile org.mockito:mockito-core syntax.
2019-08-16 11:18:41 -03:00
battleofwizards
d5ceee4dd5
Enhance docs/translation-process.md 2019-08-16 15:50:47 +02:00
battleofwizards
0a7dd4db15
Update protobuf to fix annoying warnings
Protobuf got updated to the latest released version 3.9.1.
The main motivation was to fix the following annoying warnings:

WARNING: An illegal reflective access operation has occurred
WARNING: Illegal reflective access by com.google.protobuf.UnsafeUtil (file:/home/qertoip/.gradle/caches/modules-2/files-2.1/com.google.protobuf/protobuf-java/3.5.1/8c3492f7662fa1cbf8ca76a0f5eb1146f7725acd/protobuf-java-3.5.1.jar) to field java.nio.Buffer.address
WARNING: Please consider reporting this to the maintainers of com.google.protobuf.UnsafeUtil
WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
WARNING: All illegal access operations will be denied in a future release

Additionally, protobuf-gradle-plugin got updated to 0.8.10.
2019-08-16 14:13:47 +02:00
battleofwizards
7ea3ce0443
Replace "P2P network" with "Bisq network" in GUI
Rationale: it is not obvious whether "P2P network" in GUI
refers to Bitcoin network, Tor network, traded altcoin network,
or Bisq.
2019-08-16 13:56:26 +02:00
sqrrm
b1e293efb3
Merge pull request #3093 from wiz/jhgcy2won7xnslrb-transfer
Takeover jhgcy2won7xnslrb.onion from @devinbileck
2019-08-15 09:20:08 +02:00
wiz
d39f9f7499
Takeover jhgcy2won7xnslrb.onion from @devinbileck 2019-08-15 16:07:12 +09:00
Florian Reimair
6e98a491bf
Merge pull request #3052 from ghubstan/master
Define missing dependency version variables
2019-08-14 19:15:57 +02:00
Florian Reimair
c80ab946fb
Merge branch 'master' into master 2019-08-14 19:15:29 +02:00
Florian Reimair
4eb88404b5
Merge pull request #3087 from battleofwizards/gradle-installdist-remove-useless-deletions
Remove legacy hack from build.gradle installDist task
2019-08-14 18:54:49 +02:00
Florian Reimair
963d569382
Merge pull request #3088 from wiz/wiz-bitcoin-node
Add wiz bitcoin node to BtcNodes list
2019-08-14 18:51:30 +02:00
Florian Reimair
9763753553
Merge pull request #3090 from battleofwizards/render-column-headers-in-csv-export
Render proper column headers and values for CSV exports; fix #3075
2019-08-14 18:46:41 +02:00
sqrrm
e010ba8fa1
Merge pull request #3081 from christophsturm/remove-powermock
fix build on jdk11 and jdk12. remove powermock and jmockit
2019-08-14 17:52:30 +02:00
Florian Reimair
e6378f19ca
Merge pull request #3085 from Oscar65/master
Fixed typo in ES translation
2019-08-14 17:25:19 +02:00
Florian Reimair
18e52c2c7c
Merge pull request #3079 from christophsturm/more-jdk10
Feature jdk10 instructions more prominently
2019-08-14 17:22:43 +02:00
battleofwizards
72a6b784dc
Render proper column headers and values for CSV exports; fix #3075
When exporting to CSV, both portfolio/trades and funds/transactions
were lacking the column headers.

Additionally, portfolio/trades colum values were outdated and
not matching the intended export.

Both issues are fixed.
2019-08-14 16:35:40 +02:00
wiz
32db1019b5
Add wiz bitcoin node to BtcNodes list 2019-08-14 23:23:25 +09:00
battleofwizards
9ef7f89ffd
Remove legacy hack from build.gradle installDist task
The rationale for the "delete fileTree" hack no longer exists
because the conflicting files are not created anymore.
2019-08-14 14:20:54 +02:00
Christoph Sturm
d5af6e5260 avoid acronyms 2019-08-14 10:45:05 +02:00
Christoph Sturm
bd06d2a7df document what this is for 2019-08-14 10:42:38 +02:00
Oscar65
a97b9078ea typo in usuario 2019-08-14 08:13:03 +02:00
Christoph Sturm
0e54131752
Update README.md
Co-Authored-By: Florian Reimair <office@florianreimair.at>
2019-08-13 20:38:00 +02:00
Christoph Sturm
9278ad021b don't force jdk 10 on developers 2019-08-13 19:59:12 +02:00
Christoph Sturm
95b65976ad simplify 2019-08-13 19:55:03 +02:00
Christoph Sturm
0af6097ab0 make final classes final again 2019-08-13 19:54:30 +02:00
Christoph Sturm
0babe82d09 remove jmockit 2019-08-13 19:47:40 +02:00
Christoph Sturm
5da7ca21fa remove powermock from gradle file 2019-08-13 19:34:54 +02:00
Christoph Sturm
17221cbed8 remove more powermock and jmockit tests.
ignore 2 or 3 tests that are not possible to convert now
2019-08-13 19:30:57 +02:00
Christoph Sturm
e9a45196a8 remove powermock from core. 2019-08-13 18:13:10 +02:00
Christoph Sturm
9a587609dd WIP remove powermock 2019-08-13 18:08:33 +02:00
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
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