mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,889 Commits 4 Branches 148 Tags 4.3 GiB
6b0da3d08b
Commit Graph

3486 Commits

Author SHA1 Message Date
Christoph Atteneder
ec0b657967
Merge pull request #3216 from christophsturm/optimize-logging 
More logging optimisations.
 2019-09-06 16:12:55 +02:00
Christoph Sturm
934e31d28c don't calculate values twice 2019-09-06 12:25:30 +02:00
Christoph Sturm
42311ea7d3 optimize debug logging. 2019-09-06 12:25:30 +02:00
chimp1984
9be4b71088
Add comments 2019-09-06 11:49:33 +02:00
chimp1984
7856722fa5
Remove CapabilityRequiringPayload from TradeStatistics2 
We do not have any old versions anymore which might not support
TradeStatistics2, so we can remove it.
 2019-09-06 11:49:21 +02:00
chimp1984
206c4bc6e1
Remove CapabilityRequiringPayload from AccountAgeWitness 
We do not have any old versions anymore which might not support
AccountAgeWitness, so we can remove it.
 2019-09-06 11:49:07 +02:00
Christoph Sturm
6273a58c3b Assign even more thread names at thread creation. 2019-09-06 11:07:34 +02:00
Christoph Sturm
bcaac51830 Assign more thread names at thread creation. 2019-09-06 11:07:34 +02:00
Christoph Sturm
6cb206c257 Inline unused variable 2019-09-06 11:07:34 +02:00
Christoph Sturm
175899486e Use try with resource. 2019-09-06 11:07:34 +02:00
Christoph Sturm
ac78f72c1e Set thread name at thread creation 2019-09-06 11:07:34 +02:00
chimp1984
5d4f9afa71
Add 90 days average and median BSQ price 2019-09-06 04:43:30 +02:00
battleofwizards
82e9672e91
Remove PGP keys from the KeyRing 
The PGP support was envisioned in the KeyRing but never fully
implemented. This removes the (essentially) dead code.

The protobuf message compatibility is implemented with `reserved`.
 2019-09-05 14:30:33 +02:00
Christoph Atteneder
5dcfa96741
Add portuguese (Brazil) locale 2019-09-05 10:35:35 +02:00
Christoph Atteneder
285e5f236d
Merge pull request #3189 from gordonel/patch-1 
Change trader-facing language to gender-neutral
 2019-09-04 10:33:23 +02:00
battleofwizards
1c580da5ed
Remove bouncycastle:bcprov from *direct* dependencies 
We still depend on this jar *indirectly* via bouncycastle:bcpg,
which is used for PGP signature verification of Bisq Desktop updates.

This gets us closer to prospect of removing Bounce Castle dependency
entirely in the future.

Rationale for this direction:

* We are really only using Bouncy Castle for PGP sig verification
* Java's builtin cryptography got vastly better since 2000
* We should prefer boring and proven cryptography anyway
* Australian projects should be considered compromised,
  and Bouncy Castle is run by Australian non-profit organization
* Bouncy Castle is a heavy dependency totaling 3.6MB
 2019-09-03 15:07:22 +02:00
Gordon E
7b2ab4adda
Update ApplyFilter.java 2019-09-03 12:36:42 +03:00
Gordon E
688bb4e423
Update displayStrings.properties 2019-09-03 12:35:38 +03:00
Gordon E
42a69c73bb
add missing corrections 2019-09-03 12:31:35 +03:00
Gordon E
e257df4244
Update displayStrings.properties 2019-09-03 12:12:19 +03:00
Christoph Atteneder
4139e022df
Update bitcoinj checkpoint 2019-09-02 15:14:42 +02:00
Christoph Atteneder
3fc19f92b8
Merge pull request #3182 from christophsturm/fix-npe 
fix NPE in shutdown hook
 2019-09-02 14:39:12 +02:00
chimp1984
3f885c21e5
Use ARBITRATION instead of MEDIATION 2019-09-02 14:15:15 +02:00
chimp1984
629a16f163
Change DisputeCommunicationMessage.Type enum 
To support future mediation chats
 2019-09-02 14:10:54 +02:00
Christoph Sturm
ba099d9262 fix NPE in shutdown hook 2019-09-02 13:04:29 +02:00
Chris Beams
fdecf6f33c
Remove cbeams pricenode from ProvidersRepository 
The BitcoinAverage developer plan API keys in use for this node have
recently expired. Given that we already have four other pricenodes
up and running, there's no compelling reason to keep this fifth one in
place and to pay for hosting and API keys for it every month.
 2019-09-02 12:34:22 +02:00
Christoph Atteneder
5d260ad42b
Update translations 2019-09-02 11:26:50 +02:00
Christoph Atteneder
a212a5889c
Merge pull request #3149 from ghubstan/validate-phone 
Validate phone numbers
 2019-09-02 09:47:11 +02:00
Christoph Atteneder
e0c91d22b3
Merge pull request #3176 from sqrrm/blocknotify-option 
Add rpcBlockNotificationHost option
 2019-09-02 09:20:13 +02:00
Christoph Atteneder
9c0be827c9
Merge pull request #3177 from chimp1984/fix-bsq-wallet-performance-issue 
Fix performance issue in BsqWalletService
 2019-09-02 09:19:55 +02:00
chimp1984
3412725a48
Update core/src/main/java/bisq/core/dao/monitoring/DaoStateMonitoringService.java 
Co-Authored-By: sqrrm <sqrrm@users.noreply.github.com>
 2019-09-02 01:29:54 +02:00
chimp1984
8521164adc
Add duration log for DaoStateMonitoringService 
Creating the daoStateHash is quite expensive (about 20-30 ms/block).
As this happens while parsing it delays the parsing time (parsing is
very fast). We persist t the hashes so it is only done for new blocks.
For 1 month of blocks (4000) it would take about 80-120 seconds.
It is not blocking the user thread as it is done per block and those
are parsed one after another.
 2019-09-01 23:24:08 +02:00
chimp1984
a876273c52
Reset daoFullNode in preferences if rpc data are not set 2019-09-01 22:58:51 +02:00
chimp1984
40de3c528d
Improve logging 
- Add better logs and duration measurements for expensive operations
- Convert debug logs to trace to avoid flooding the output in debug log
mode.
- Cleanups
 2019-09-01 22:57:40 +02:00
chimp1984
6dafafd7b1
Fix performance issue in BsqWalletService 
The updateBsqWalletTransactions method got called at each block for all
transactions. During block download that wasted a lot of cpu and
led to stuck UI thread and lost connections.
The updateBsqBalance is not cheap (a few ms) and called for 100s of txs
at each block was very problematic.
Furthermore the listeners on the walletTransactions observableList got
triggered which made the situation worse.

We changed the observableList to a ArrayList and use a listener which
gets called after the list is updated.
We also make sure the onTransactionConfidenceChanged listener is not
calling updateBsqWalletTransactions if bsq parsing is not complete and
if the depth of the tx is > 1.
In the updateBsqWalletTransactions method we use a flag and a delay
to ensure that the updateBsqBalance is not called more then once
in 100 ms.

We changed also the getter to return a cloned version of the list to
avoid potential concurrent modification exceptions at clients.

Closes #3175
 2019-09-01 22:47:10 +02:00
sqrrm
f30b68b39f
Fix tests 2019-09-01 19:10:26 +02:00
sqrrm
a13600f2f3
Add rpcBlockNotificationHost option 2019-09-01 18:42:48 +02:00
chimp1984
39e22ca44e
Fix bug with not showing system msg at peer who receives msg 
- We only added the system msg when one opens the chat but not when
one received a message.
 2019-08-31 01:14:43 +02:00
ghubstan
de4b59048b
Integrate PhoneNumberValidator into SwishForm 
PhoneNumberValidator + Test Changes:
  Added no-arg constuctor required for Guice injection.
  Added isoCountryCode setter;  this field must be set before
  validation.
  Added validation of isoCountryCode.
  Added missing country code test.

SwishValidator Changes:
  SwishValidator now extends PhoneValidator.
  Added no-arg constuctor required for Guice injection.
  Set isoCountryCode = SE in constructor.

SwishForm Changes:
  Sets Swish acct phone number to normalized phone number if
  phone # validation is successful.
  Replaced Logger declaration with @Slf4j annotation.
  Formatted source.

Added 'validation.phone.missingCountryCode' property to i18n file.
 2019-08-30 15:27:46 -03:00
Christoph Atteneder
b5f871b8ed
Merge pull request #3165 from chimp1984/trade-chat 
Traders chat
 2019-08-30 19:00:03 +02:00
chimp1984
50baa9b023
Close chat window if dispute gets closed 2019-08-30 18:44:43 +02:00
chimp1984
c615780333
Update tradeChat.rules 2019-08-30 17:07:35 +02:00
chimp1984
16d3bc5d26
Update core/src/main/resources/i18n/displayStrings.properties 
Co-Authored-By: Steve Jain <mfiver@gmail.com>
 2019-08-30 16:54:16 +02:00
chimp1984
fa307207ac
Update core/src/main/resources/i18n/displayStrings.properties 
Co-Authored-By: Steve Jain <mfiver@gmail.com>
 2019-08-30 16:53:39 +02:00
sqrrm
dec5982b2a
Add BRL as mature market 
Move mature currency settings to CurrencyUtil as that seems a better fit
 2019-08-30 13:57:23 +02:00
chimp1984
5e267fa461
Handle nullables 2019-08-30 01:01:29 +02:00
chimp1984
663d8591c4
Add chat rules system msg; cleanups 2019-08-30 00:58:06 +02:00
chimp1984
5c1999f180
Fix wrong pubkey 2019-08-30 00:57:21 +02:00
chimp1984
a2cd80866d
Add missing setWasDisplayed 2019-08-30 00:07:32 +02:00
sqrrm
cb55693d4e
Set active currencies as high chargeback risk 2019-08-30 00:01:40 +02:00
chimp1984
81a93b56b1
Add onAllServicesInitialized call, rename method 2019-08-29 22:55:02 +02:00
chimp1984
e0c1a85406
Add wasDisplayed field to chatMsg 
- Fix logger
- Manage display state off trade chat msg (wip)
 2019-08-29 22:29:36 +02:00
chimp1984
855cb4f620
Add missing allServicesInitialized check 2019-08-29 21:40:32 +02:00
chimp1984
fa43f03151
Merge branch 'master_upstream' into sq-add-trader-chat 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/disputes/trader/TraderDisputeView.java
 2019-08-29 19:09:49 +02:00
chimp1984
bfb111da67
Add close handler to popup 
- Close already open chat if new one opens
 2019-08-29 18:56:11 +02:00
Christoph Atteneder
3ccae6922d
Merge pull request #3152 from wiz/darkmode 
Dark Mode
 2019-08-29 18:53:49 +02:00
chimp1984
2189cba41b
Show chat in popup instead of tab (WIP) 2019-08-29 17:50:14 +02:00
chimp1984
8e3a3514a3
Add comments, cleanup, fix wrong param name 2019-08-29 17:14:56 +02:00
chimp1984
cb673764df
Update string 2019-08-29 17:13:57 +02:00
chimp1984
5d338e693c
Fix merge issues 2019-08-29 17:07:39 +02:00
chimp1984
329572cc5d
Merge branch 'master_upstream' into sq-add-trader-chat 
# Conflicts:
#	core/src/main/java/bisq/core/arbitration/DisputeManager.java
#	core/src/main/java/bisq/core/arbitration/messages/DisputeCommunicationMessage.java
#	core/src/main/java/bisq/core/trade/Trade.java
 2019-08-29 16:50:32 +02:00
Florian Reimair
4e7cb04043
Merge pull request #3154 from chimp1984/Fix-small-P2P-network-issues 
Fix small p2p network issues
 2019-08-29 16:15:18 +02:00
wiz
4eb85b955e
Add toggle switch UI preference for Dark Mode on/off 
* Store preference for Dark Mode as int32 css_theme
 2019-08-29 20:20:25 +09:00
chimp1984
a0e690997a
Merge branch 'master_upstream' into Fix-small-P2P-network-issues 
# Conflicts:
#	core/src/main/java/bisq/core/setup/CoreNetworkCapabilities.java
 2019-08-28 19:49:18 +02:00
Devin Bileck
70a4009e85
Update backup operator 2019-08-28 09:16:06 -07:00
Devin Bileck
9c7c301860
Merge branch 'master' of https://github.com/bisq-network/bisq into add-seednode-backup 
# Conflicts:
#	core/src/main/resources/btc_mainnet.seednodes
 2019-08-28 09:14:14 -07:00
Christoph Atteneder
4478476763
Merge pull request #3151 from chimp1984/dont-send-bsq-blocks-to-full-nodes 
Do not send BSQ blocks to full nodes
 2019-08-28 12:42:16 +02:00
sqrrm
f8fe464ca3
Merge pull request #3121 from sqrrm/arbitrator-to-sign 
Arbitrator to sign
 2019-08-28 11:13:35 +02:00
wiz
80ce113cae
Add @nicolasdorier as backup seednode operator for jhgcy2won7xnslrb 2019-08-28 17:04:44 +09:00
chimp1984
79c08b6e04
Remove Capability.SIGNED_ACCOUNT_AGE_WITNESS 2019-08-28 01:20:10 +02:00
Devin Bileck
1790637c84
Add backup operator for seeds 3f3cu2yw7u457ztq and fl3mmribyxgrv63c 2019-08-27 15:32:55 -07:00
chimp1984
4bc6616e7a
Do not send BSQ blocks to full nodes 2019-08-27 19:27:39 +02:00
ghubstan
39d823a6fb
Validate phone numbers 
Created new PhoneNumberValidator + Test. Validator hides
no arg constructor; public constructor requires two letter
ISO country code for validating inputs.

After successful validation, inputs are transformed into E.164
format and cached in a field, accessible via a getter method.
However, area and region codes are not checked for correctness.
End users are responsible for correctness of area/region codes.

Four i18n properties (validation.phone.*) were added to
displayStrings.properties

This is a partial fix for Issue #3042. The validator
will be integrated into the GUI if PR is approved & patch is
merged.

Question for Bisq devs:
Another new pkg protected class, CountryCallingCodes, contains
an immutable map of ISO country codes -> country calling codes;
it is the only non-validator class in its package. The map
declaration is too large to live in the PhoneNumberValidator class,
even after tweaking idea.properties in an attempt to prevent
the IDE from freezing. Is it OK to leave CountryCallingCodes
where it is, or is there a more appropriate home for it?
 2019-08-27 12:19:52 -03:00
wiz
f5d75c4f60
Improve TempProposal processing (fixes #3143) 2019-08-27 22:36:37 +09:00
Christoph Atteneder
66e963aaa7
Merge pull request #3059 from camthegeek/list-masari 
List Masari (MSR)
 2019-08-27 14:19:11 +02:00
sqrrm
e3bd3a99e3
Merge remote-tracking branch 'origin/master' into arbitrator-to-sign 2019-08-27 11:27:33 +02:00
Christoph Atteneder
e93370ccd5
Merge pull request #3122 from christophsturm/fix-defaultseednoderepository 
fix random test failure.
 2019-08-27 10:01:16 +02:00
Christoph Atteneder
db823dda60
Merge pull request #3131 from christophsturm/improve-logging 
fix logging of peer address
 2019-08-27 09:43:23 +02:00
Christoph Atteneder
70e304e828
Merge pull request #3135 from TyphooN-/list-solo 
List Solo (XSL)
 2019-08-27 09:35:53 +02:00
sqrrm
74244c4ad9
Add non static ChargeBackRisk wrapper 2019-08-26 14:33:50 +02:00
sqrrm
972dda655b
Test BuyerDataItem, use lombok generated equals and hash 2019-08-26 11:33:42 +02:00
TyphooN
8e237b23ef
List Solo (XSL) 2019-08-23 17:11:51 -04:00
Christoph Sturm
31285b4419 Fix logging 
don't log peer as optional [....onion]
 2019-08-23 17:16:58 +02:00
Devin Bileck
7da3bab9ca
Suppress RPC service log entries when running as DAO lite node 
When running as DAO lite node, the following would get logged:

> INFO  b.c.dao.node.full.RpcService: The value of rpchost is
> INFO b.c.dao.node.full.RpcService: Starting RPCService with btcd-cli4j
version 0.5.8.4 on 127.0.0.1:8332 with user null

So instead of logging it when instantiating the RPCService, log it when
setting up the service.
 2019-08-23 01:38:08 -07:00
Christoph Sturm
5a67d9f092 fix random test failure. 2019-08-21 19:04:43 +02:00
sqrrm
61895102fd
Arbitrator sign accountAgeWitnesses 
Automatically filter to only sign accounts that
- have chargeback risk
- bought BTC
- was winner in dispute
 2019-08-21 17:43:29 +02:00
sqrrm
aed1e8027e
Publish signed witness 2019-08-21 17:35:43 +02:00
sqrrm
ad9715a2cd
Merge pull request #3108 from christophsturm/test-signed-witness 
make sure that signed witness is immutable.
 2019-08-21 16:31:37 +02:00
wiz
4d2a819a65
Add wiz's 2nd Bitcoin node 2019-08-21 18:17:18 +09:00
sqrrm
f2f62c7033
Merge pull request #3112 from freimair/optimizations 
Various optimizations
 2019-08-20 22:08:19 +02:00
Christoph Sturm
856630d1f0 Improve naming 2019-08-20 12:49:42 +02:00
Florian Reimair
ecd01fd91d
Adjust log levels of price feed service 2019-08-20 12:08:02 +02:00
Florian Reimair
5ff4bc2201
Adjust log level for DAO logging statements 2019-08-20 12:08:02 +02:00
Florian Reimair
bd3f999e5c
Only validate param change after parsing is done 2019-08-20 12:06:22 +02:00
Florian Reimair
0501412d8e
Fix performance issue with DaoResultView 2019-08-20 11:18:17 +02:00
Christoph Sturm
f3b3ca9fc4 make sure that signed witness is immutable. 
btw I do hate byte arrays
 2019-08-19 20:14:21 +02:00
Christoph Sturm
2ccecd2738 fix formatting 2019-08-19 18:26:39 +02:00
Christoph Sturm
aae430887e fix formatting, set method parameter wrapping to "chop if long" 2019-08-19 18:13:05 +02:00
Christoph Sturm
79b3e5baf3 inject storage where possible 2019-08-19 17:21:35 +02:00
Christoph Sturm
7694d4e7d1 change some storage creations to injection. ensure its not a singleton 2019-08-19 17:19:45 +02:00
Christoph Sturm
b77cff9e26 inject CorruptedDataFilesHandler instead of making it static 2019-08-19 16:54:46 +02:00
sqrrm
4381eea242
Merge pull request #3086 from christophsturm/p2ptest 
inject publickeyring
 2019-08-16 18:22:38 +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
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
Christoph Sturm
9b41cb8f90 fix seednode guice config 2019-08-14 17:58:04 +02:00
Christoph Sturm
9eb174bc88 provide PubKeyRing and use it where appropriate instead of keyring 2019-08-14 17:58:04 +02:00
Christoph Sturm
ac6068b728 start testing MyProposalListService. 2019-08-14 17:58:04 +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
wiz
32db1019b5
Add wiz bitcoin node to BtcNodes list 2019-08-14 23:23:25 +09: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
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
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
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
sqrrm
fb1c96d24c
Merge pull request #2976 from niyid/master 
Fixes for issues #2741, #2944, #2955
 2019-08-09 15:35: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
Christoph Atteneder
8164116c86
Update bitcoinj checkpoint file 2019-08-08 09:44:37 +02:00
Christoph Atteneder
a1bc159df0
Update translations 2019-08-07 22:43:09 +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
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
sqrrm
47c7910e88
Move Clock binding to P2PModule 2019-08-01 11:43:43 +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
sqrrm
360dc0b4e8
Merge pull request #3037 from christophsturm/inject-clock 
inject clock for usage in isDateInTolerance
 2019-07-30 16:12:48 +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
9f54f480e6 move all init code to setUp 2019-07-30 13:07:12 +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
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
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