chimp1984
25a7979b02
Merge branch 'master_upstream' into reduce-initial-date-request
2020-10-02 13:05:56 -05:00
chimp1984
f5862ec2f6
UserThread must not be used before application is created.
2020-10-01 23:01:49 -05:00
chimp1984
3df2f7e177
Add HISTORY field. Make isNewVersion public
2020-10-01 15:06:34 -05:00
chimp1984
df90b2440a
Add new methods and refactor APIs. Needed later for new classes....
2020-10-01 15:02:44 -05:00
chimp1984
ff1380481d
Merge branch 'master_upstream' into improve-startup-routines
...
# Conflicts:
# core/src/main/java/bisq/core/app/BisqSetup.java
2020-10-01 10:34:43 -05:00
chimp1984
9fce06832d
Rename baseCurrencyNetworkParameters to networkParameters
2020-10-01 09:46:11 -05:00
chimp1984
0af9e133a4
Cleanups
2020-10-01 09:42:33 -05:00
chimp1984
fb41a1984b
Merge branch 'master_upstream' into fix-delayed-payout-tx-issues
...
# Conflicts:
# core/src/main/java/bisq/core/trade/TradeManager.java
# desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java
2020-10-01 09:24:46 -05:00
chimp1984
6e7e975c05
Improve printSystemLoad
2020-09-30 23:03:11 -05:00
chimp1984
346ad517a1
Refactor: Move osUserDataDir method to Utilities, rename to getUserDataDir
2020-09-30 22:43:11 -05:00
chimp1984
a38f59a88a
Refactor: Move common bases setup code to CommonSetup
2020-09-30 22:36:18 -05:00
chimp1984
51ce37ded9
Refactor: Rearrange methods
2020-09-30 22:32:47 -05:00
chimp1984
073f1630b1
Remove Remove LimitedKeyStrengthException as not needed anymore
2020-09-30 22:32:10 -05:00
chimp1984
49866508c1
Remove checkCryptoPolicySetup as not needed anymore
2020-09-30 22:31:37 -05:00
chimp1984
4f9a6ea436
Refactor: Move periodic printSystemLoad to commonSetup
2020-09-30 22:17:36 -05:00
chimp1984
516da22a09
Refactor: Add setup method in DevEnv
2020-09-30 22:12:20 -05:00
chimp1984
b927f9719e
Refactor: Move DevEnv setup to CommonSetup
2020-09-30 22:11:29 -05:00
chimp1984
9d12bf7d52
Refactor: Move sig int handlers to CommonSetup
2020-09-30 22:10:44 -05:00
chimp1984
7ea3676c55
Refactor: Rename setup to setupUncaughtExceptionHandler
...
rename setupErrorHandler to checkCryptoPolicySetup
move UncaughtExceptionHandler code to setupUncaughtExceptionHandler
2020-09-30 21:55:50 -05:00
chimp1984
b6e97e371e
Refactor: add new setup method to CommonSetup with config (WIP) and call it at doExecute. Move AsciiLogo to CommonSetup
2020-09-30 21:53:29 -05:00
chimp1984
fe7ccbd6f9
Refactor: extract method
2020-09-30 21:51:31 -05:00
chimp1984
b73fff0aad
Refactor: Move AsciiLogo to common
2020-09-30 21:50:47 -05:00
chimp1984
3242d86321
Apply code inspection suggestions
2020-09-29 13:08:55 -05:00
chimp1984
11eb24bb53
Simplify statements
2020-09-29 13:04:12 -05:00
chimp1984
87272ad3a5
Use final
2020-09-29 13:02:44 -05:00
chimp1984
4c7f6147e9
Remove not needed stream()
2020-09-29 13:02:32 -05:00
chimp1984
94bc2359ed
Delete unused class
2020-09-29 13:00:33 -05:00
chimp1984
3926a36c3a
Use params for trace logs.
2020-09-29 12:55:23 -05:00
chimp1984
10bedee803
Merge branch 'dispute-agent-branch' into fix-delayed-payout-tx-issues
...
# Conflicts:
# core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSetupDepositTxListener.java
2020-09-25 15:03:28 -05:00
chimp1984
2b747cc323
Don't return null if name is null by try to use UNDEFINED. Only if that is not present we return null
2020-09-22 18:48:47 -05:00
Christoph Atteneder
69d533d9ea
Merge pull request #4520 from cd2357/show-qubes-info-popup
...
Show info popup if Bisq started under Qubes OS
2020-09-22 16:21:03 +02:00
Oscar Guindzberg
d4ac45da21
bitcoinj 0.15: bitcoinj moved from spongycastle to bouncycastle.
2020-09-18 18:29:28 -03:00
Christoph Atteneder
81df879881
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.9
...
# 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
2020-09-16 16:52:54 +02:00
Christoph Atteneder
06ac7a7605
Bump version number for v1.3.9
2020-09-16 15:58:58 +02:00
chimp1984
f6cb7c6696
Ensure the division is not by 0 and add try catch to MovingAverage
2020-09-16 15:56:19 +02:00
Christoph Atteneder
8cb4b5016c
Merge pull request #4529 from chimp1984/make-moving-average-code-more-safe
...
Make moving average code more safe
2020-09-16 15:51:14 +02:00
Christoph Atteneder
98b03937d8
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.8
...
# Conflicts:
# core/src/main/java/bisq/core/support/dispute/agent/MultipleHolderNameDetection.java
# core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
2020-09-15 13:24:06 +02:00
chimp1984
70d98d9554
Ensure the division is not by 0 and add try catch to MovingAverage
2020-09-14 16:06:52 -05:00
cd2357
8d793e9a83
Show info popup if Bisq started under Qubes OS
...
Show popup informing the user about the OS-specific setup guide.
2020-09-13 13:23:12 +02:00
chimp1984
54fdb5267f
Instead of renaming the AddressEntryList to a backup file we keep it
...
at restore from seed and create a backup copy.
I don't know what was the motivation of removing the original file
(probably the use case that the seeds are different and thus there
is no match of existing entries with the new addresses) as
that breaks the internal association of addresses with trades/offers and
the reserved balances display.
This should be tested well though with the related use cases
(diff. offer and trade states, wallet restore with same seed of with
foreign seed -> in that case we need to recreated the AddressEntryList
but that should be handled in the related domain)
- Add copyFile method
2020-09-08 19:14:38 -05:00
Christoph Atteneder
ca88bc9b4f
Bump version number for v1.3.8
2020-09-03 17:34:34 +02:00
Christoph Atteneder
77c7629478
Merge branch 'master' of github.com:bisq-network/bisq into add-xmr-tx-key-service-3
...
# Conflicts:
# desktop/src/main/java/bisq/desktop/main/MainView.java
# desktop/src/main/java/bisq/desktop/main/MainViewModel.java
2020-09-03 17:10:05 +02:00
chimp1984
ff7e3cb4cc
Add check for major version as well
2020-09-02 16:23:20 -05:00
chimp1984
842eeebe56
Show popup about key-logger warning if OSX version is >= 10.14
...
Tell user about the issue and instruct him how to change OS settings.
2020-09-02 10:26:33 -05:00
sqrrm
604dabbb46
Merge pull request #4461 from ghubstan/1-singleton-coreapi
...
Make CoreApi a singleton
2020-09-02 14:44:23 +02:00
Christoph Atteneder
095c8b5bdb
Merge pull request #4415 from sqrrm/dev-css
...
Add option to use different css for dev mode
2020-09-02 14:20:57 +02:00
chimp1984
039860935d
Merge master
...
- fix tests
2020-09-01 19:53:23 -05:00
sqrrm
f0acec0cb1
Add option to use different color header in dev mode
...
This is to help differentiate dev instances and live ones.
This can help devs avoiding silly mistakes.
2020-09-01 23:03:22 +02:00
chimp1984
77841e230f
Change log level
...
In cased new fields are added to PB this case is expected as well in
development if protbuf definitions have changed over time and persisted
data do not match the new definition. We don't want this log to be
that verbose.
2020-09-01 10:58:00 -05:00
ghubstan
7ed5028b8e
Add @VisibleForTesting annotation
...
The access modifier on CompositeOptionSet was changed to public
in commit c402386
2020-09-01 10:58:37 -03:00
