Manfred Karrer
2ba21f0277
Update display string
2018-12-02 14:24:37 +01:00
Manfred Karrer
5b17d3d571
Merge pull request #2028 from ManfredKarrer/do-not-use-tor-for-btcj-testnet
...
Do not use tor for btcj testnet
2018-12-02 13:39:10 +01:00
Manfred Karrer
5a11314abb
Merge branch 'release-candidate-0.9.0' into do-not-use-tor-for-btcj-testnet
2018-12-02 13:37:05 +01:00
Manfred Karrer
fe458bce12
Don't use tor for BitcoinJ if testnet
2018-12-02 13:36:47 +01:00
Manfred Karrer
8507e0d665
Merge branch 'master' into release-candidate-0.9.0
...
# Conflicts:
# assets/src/main/java/bisq/asset/coins/BitCloud.java
# assets/src/main/java/bisq/asset/coins/Credits.java
# assets/src/main/java/bisq/asset/coins/Cryptonodes.java
# assets/src/main/java/bisq/asset/coins/DRIP.java
# assets/src/main/java/bisq/asset/coins/FuturoCoin.java
# assets/src/main/java/bisq/asset/coins/MegaCoin.java
# assets/src/main/java/bisq/asset/coins/NewPowerCoin.java
# assets/src/main/java/bisq/asset/coins/Wavi.java
# assets/src/test/java/bisq/asset/coins/BitCloudTest.java
# assets/src/test/java/bisq/asset/coins/CreditsTest.java
# assets/src/test/java/bisq/asset/coins/CryptonodesTest.java
# assets/src/test/java/bisq/asset/coins/DRIPTest.java
# assets/src/test/java/bisq/asset/coins/FuturoCoinTest.java
# assets/src/test/java/bisq/asset/coins/MegaCoinTest.java
# assets/src/test/java/bisq/asset/coins/NewPowerCoinTest.java
2018-12-02 12:27:30 +01:00
Manfred Karrer
4da613f4b5
Merge branch 'master' into release-candidate-0.9.0
...
# Conflicts:
# assets/src/main/java/bisq/asset/coins/BitCloud.java
# assets/src/main/java/bisq/asset/coins/Credits.java
# assets/src/main/java/bisq/asset/coins/Cryptonodes.java
# assets/src/main/java/bisq/asset/coins/DRIP.java
# assets/src/main/java/bisq/asset/coins/FuturoCoin.java
# assets/src/main/java/bisq/asset/coins/MegaCoin.java
# assets/src/main/java/bisq/asset/coins/NewPowerCoin.java
# assets/src/main/java/bisq/asset/coins/Wavi.java
# assets/src/test/java/bisq/asset/coins/BitCloudTest.java
# assets/src/test/java/bisq/asset/coins/CreditsTest.java
# assets/src/test/java/bisq/asset/coins/CryptonodesTest.java
# assets/src/test/java/bisq/asset/coins/DRIPTest.java
# assets/src/test/java/bisq/asset/coins/FuturoCoinTest.java
# assets/src/test/java/bisq/asset/coins/MegaCoinTest.java
# assets/src/test/java/bisq/asset/coins/NewPowerCoinTest.java
2018-12-02 12:27:03 +01:00
Manfred Karrer
d0d1cd5502
Merge pull request #2024 from albpal/java-for-os-rpm-based
...
Added script to install Java SE 10 target platform on OS rpm based
2018-12-02 12:21:29 +01:00
Manfred Karrer
aca9018190
Merge pull request #2026 from devinbileck/fix-windows-system-tray-icon
...
Fix incorrectly named Windows system tray 2x icon
2018-12-02 12:20:43 +01:00
Devin Bileck
76c8a148f3
Fix incorrectly named Windows system tray 2x icon
2018-12-02 00:18:14 -08:00
Manfred Karrer
5b3d521e36
Imprve text and actiavte chainSyncIndicator when not synced
2018-12-02 01:18:58 +01:00
Manfred Karrer
ebc5d4e5ab
Merge pull request #2025 from CaveSpectre11/issue-2021-address-validation-fix
...
Issue 2021 - Asset validation override issues in many coin extensions
2018-12-01 21:35:24 +01:00
Cave Spectre
2288042080
Issue 2021 - Asset validation override issues in many coin extensions
...
- Fix length issue in regular expression of validate() override in main asset coins.
PIVX most likely started the 1+{25,34} that was then proliferated through the copies.
While it likely should be 1+33, I could only confirm that 35 is too long, so the
code is changed to be 1+{24,33} in order to reduce it by the presumed forgotten first
character.
- Fixup testInvalidAddresses() to better test regex rules in test asset coins. The PIVX
base code was testing against 3 addresses, that all had a different first character,
therefore none of the rest of the regular expression was being tested. Changed those
addresses (and others for other susceptable coins) to accurately test first character
match, length, and invalid characters in the 24 to 33 series.
2018-12-01 14:57:30 -05:00
Albert Palau
188f14f988
Added script to install Java SE 10 target platform on OS rpm based
2018-12-01 16:30:59 +01:00
Christoph Atteneder
d396ab2c32
Merge pull request #2020 from ManfredKarrer/fix-wallet-date
...
Use date of 0.5 release if no date for seed was specified
2018-12-01 07:32:46 +01:00
Christoph Atteneder
99e7c670ce
Merge pull request #2022 from ManfredKarrer/fix-missing-country-in-locale
...
Use en_US if default locale has no country defined.
2018-12-01 07:32:07 +01:00
Manfred Karrer
86f44c7a64
Use en_US if default locale has no country defined.
...
On some systems there is not country defined, in that case we use en_US
2018-12-01 01:15:17 +01:00
Manfred Karrer
d929128652
Merge branch 'master' into release-candidate-0.9.0
2018-11-30 23:08:52 +01:00
Manfred Karrer
a9a8703de0
Merge pull request #2019 from ManfredKarrer/fix-log-path
...
Fix log path
2018-11-30 23:07:31 +01:00
Manfred Karrer
717f5fb9b2
Use date of 0.5 release if no date for seed was specified
...
We had set the data to 0 which would lead to set the wallet date to the
genesis block. We had a "hard fork" with v0.5. so we can use that date
to ensure that the wallet birth date cannot be older.
2018-11-30 22:55:30 +01:00
Manfred Karrer
e22ee3dcca
Merge pull request #2018 from cbeams/pricenode-readme
...
Reintroduce pricenode/README.md
2018-11-30 22:30:42 +01:00
Manfred Karrer
289b263d84
Fix log path
...
Resolving the property from the bisqEnvironment via getProperty returns
the default value instead of the program argument value. Not sure why,
seems to be related to recent changes in the property handling.
2018-11-30 21:50:32 +01:00
Chris Beams
0a34505cda
Reintroduce pricenode/README.md
...
In the process of reconsolidating the bisq-network/bisq-pricenode
repository back into this repository as a submodule, this
this README was not carried over. This change simply copies the README
over from the old repo.
2018-11-30 21:31:41 +01:00
Manfred Karrer
26bcbc466f
Merge pull request #2016 from ManfredKarrer/bug-fixes-dao
...
Bug fixes dao
2018-11-30 21:17:18 +01:00
Manfred Karrer
ddc2385829
Update testnet seed nodes
2018-11-30 21:12:58 +01:00
Manfred Karrer
54b6590ded
Fix new testnet genesis tx
2018-11-30 18:06:03 +01:00
Manfred Karrer
3c6342f4d6
Merge branch 'release-candidate-0.9.0' into bug-fixes-dao
2018-11-30 17:36:30 +01:00
Manfred Karrer
3a343d7a67
Merge branch 'master' into release-candidate-0.9.0
2018-11-30 17:36:05 +01:00
Manfred Karrer
1ff5a55b27
Add new testnet genesis tx
2018-11-30 17:35:24 +01:00
Manfred Karrer
d8c553ca4e
Add phases for testnet
2018-11-30 17:03:12 +01:00
Manfred Karrer
9ced987c3d
Use a min. trial period of 30 days for asset listings
2018-11-30 16:49:16 +01:00
Manfred Karrer
0a5672a1d3
Merge pull request #2012 from sqrrm/bonded-role-popup
...
Make role details popup readable
2018-11-30 16:24:17 +01:00
sqrrm
cbbc723cd1
Make role details popup readable
2018-11-30 16:15:53 +01:00
Manfred Karrer
7fefa1e5e7
Only check if data adn txType is valid in getAllValidBallots
...
Rename getValidAndConfirmedBallots to getAllValidBallots.
We cannot do a phase and cycle check as we are interested in
historical ballots as well.
Use warn level for logs in case data is missing and requested to
give more weight to those exceptional cases.
2018-11-30 16:04:16 +01:00
Manfred Karrer
44c62716d6
Add validation for ballots used for vote result
2018-11-30 15:20:10 +01:00
Manfred Karrer
04706969cf
Merge pull request #2008 from BravoIndia/patch-1
...
Update build.md (Clarify Windows gradlew command)
2018-11-30 13:47:39 +01:00
BravoIndia
91766ecad3
Update build.md
2018-11-30 15:56:36 +07:00
Manfred Karrer
e354fac270
Merge pull request #2003 from devinbileck/scripts
...
Add install_java.sh
2018-11-30 02:18:40 +01:00
Manfred Karrer
a0cbfe4d58
Merge pull request #2002 from ripcurlx/ui-improvements
...
Redesign: UI improvements/fixes during release testing
2018-11-29 22:20:28 +01:00
Christoph Atteneder
a018068bc2
Improve WesternUnion form for buyer
2018-11-29 21:12:25 +01:00
Christoph Atteneder
8b290c3a50
Improve USPostalMoneyOrder form for buyer
2018-11-29 21:07:35 +01:00
Christoph Atteneder
89707ae663
Improve Swish form for buyer
2018-11-29 21:03:14 +01:00
Christoph Atteneder
2e88b5ee19
Add workaround again for button labels
2018-11-29 20:54:59 +01:00
Christoph Atteneder
8b8022aa7e
Position cancel button right
2018-11-29 20:54:17 +01:00
Christoph Atteneder
257170675d
Remove top padding
2018-11-29 20:53:42 +01:00
Manfred Karrer
d0c11ded15
Merge branch 'release-candidate-0.9.0' into bug-fixes-dao
2018-11-29 18:13:21 +01:00
Manfred Karrer
2e93a1f2f5
Merge branch 'master' into release-candidate-0.9.0
2018-11-29 18:12:58 +01:00
Manfred Karrer
2a217aba61
Add old colored tor icons
2018-11-29 18:12:42 +01:00
Manfred Karrer
07ad987e9f
Merge pull request #1987 from devinbileck/testing-guide
...
Add testing guide
2018-11-29 18:10:51 +01:00
Manfred Karrer
459893db88
Merge branch 'release-candidate-0.9.0' into bug-fixes-dao
2018-11-29 18:08:37 +01:00
Manfred Karrer
0c8b00e4bd
Merge branch 'master' into release-candidate-0.9.0
2018-11-29 18:07:52 +01:00