Manfred Karrer
7e7a06a0da
Merge branch 'jbg-add-xspec'
...
# Conflicts:
# gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
# gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2017-12-19 21:22:42 +01:00
Manfred Karrer
23f13c10fe
Merge XSPEC
2017-12-19 21:22:02 +01:00
Manfred Karrer
ad8c23b294
Merge branch 'add-xspec' of https://github.com/jbg/exchange into jbg-add-xspec
2017-12-19 21:20:40 +01:00
Manfred Karrer
ab07e6c47c
Merge branch 'ibininja-master'
...
# Conflicts:
# core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
# gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
# gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2017-12-19 21:19:26 +01:00
Manfred Karrer
f3b759046b
Merge
2017-12-19 21:18:37 +01:00
Manfred Karrer
3c0082aee5
Merge branch 'master' of https://github.com/ibininja/exchange into ibininja-master
2017-12-19 21:14:55 +01:00
Manfred Karrer
a5289460d3
Merge PR for Cage
2017-12-19 21:11:44 +01:00
Manfred Karrer
8f48e080cb
Merge branch 'master' into Development
...
# Conflicts:
# core/src/main/java/io/bisq/core/btc/BitcoinNodes.java
# core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
# core/src/main/java/io/bisq/core/filter/FilterManager.java
2017-12-19 19:55:00 +01:00
Arash Ohadi
2879083c8b
Fix typo 'needs' to 'need'
2017-12-19 12:24:14 +01:00
Manfred Karrer
852d4c5ba5
Add and change btc, seed and provider nodes. Use only HS nodes if tor is used for btcj
2017-12-18 23:37:32 +01:00
swordfish5975
eeceef2bb1
Cagecoin
2017-12-18 21:11:16 +10:00
swordfish5975
86370ea1cc
CageCoin
2017-12-18 21:01:29 +10:00
Ibrahim MOKDAD
c6c6892e27
Updated, added true for running on eth blockchain
2017-12-17 09:34:30 +03:00
Ibrahim MOKDAD
158a6badc7
Added CryptoCurrency CRED
2017-12-17 09:03:58 +03:00
Jasper Bryant-Greene
539c767476
Added XSPEC altcoin
2017-12-11 14:21:32 +01:00
Manfred Karrer
558157082d
Add filter for btc nodes
2017-12-07 23:14:34 -05:00
Manfred Karrer
e3408ea9d1
Merge branch 'BetterUpdateWindow' into Development
2017-12-07 22:27:32 -05:00
Manfred Karrer
35b2b46d36
Add update later button. Make version lable clickable and show updates
2017-12-07 22:24:24 -05:00
Manfred Karrer
ea5548f2ec
Add coin selection options to withdrawal screen
2017-11-30 23:01:30 -05:00
Manfred Karrer
52d6d8adc6
Add option in withdrawal screen to include or exclude miner fee
2017-11-30 21:29:56 -05:00
Manfred Karrer
714565c990
Add check if list is not empty. Reset DevEnv flags.
2017-11-28 19:19:22 -05:00
Manfred Karrer
fe92092f9c
Hide fee window if DAO trading is deactivated
2017-11-28 18:38:16 -05:00
Manfred Karrer
0e44efcfb9
Use fee selection popup for take offer
2017-11-28 18:12:43 -05:00
Manfred Karrer
96cc6dbe3a
Add popup for fee currency selection
2017-11-28 12:52:30 -05:00
Manfred Karrer
e071653651
Add new flag to DevEnv
2017-11-27 22:17:23 -05:00
Manfred Karrer
0de1c6a6c2
Improve UI
2017-11-27 11:31:37 -05:00
Manfred Karrer
2bd7b59b9a
Use currency name instead of code for compareTo
2017-11-27 11:28:34 -05:00
Manfred Karrer
2b248c5426
Separate fees in trade complete screen. Show withdrawal btc address only after button click
2017-11-26 20:06:11 -05:00
Manfred Karrer
eeb503c13f
Merge branch 'Development'
2017-11-26 18:25:08 -05:00
Manfred Karrer
9fe58976ce
Release candidate 0.6.1
2017-11-26 17:13:05 -05:00
Manfred Karrer
e3c9f150f5
Clean up
2017-11-26 16:35:47 -05:00
Manfred Karrer
838bf72a60
Use libdohj bba4088c. Improve logging. Cleanup
2017-11-26 11:40:53 -05:00
Manfred Karrer
0d8c600b6c
Add waring popups for aridrop coins
2017-11-25 09:57:43 -05:00
Mike Rosseel
b8b84bc35f
Add Bitcoin Cash, Bitcoin Gold and Bitcoin Clashic so that these can
...
be transacted in a privacy-preserving way
2017-11-25 10:07:25 +01:00
Manfred Karrer
07d85b3f8b
Set version 0.6.1. Add versions for seed and statistics nodes
2017-11-24 14:23:49 -05:00
Manfred Karrer
b7e55ef426
Merge branch 'master' of https://github.com/madcoin-project/exchange into madcoin-project-master
2017-11-24 13:31:30 -05:00
Manfred Karrer
af754706f6
Add Sepa instant payment
2017-11-23 19:13:43 -05:00
Christoph Atteneder
b680bf9b5d
Fix truncation issues and add missing translations
2017-11-23 18:21:43 +01:00
Christoph Atteneder
6b65262fc3
Use a more general wording for nodes that violate consensus rules
2017-11-23 18:11:49 +01:00
Manfred Karrer
6137ec53ae
Merge branch 'Development'
2017-11-23 09:02:58 -05:00
Christoph Atteneder
fd8c923a40
Remove unused translation keys
2017-11-17 15:12:30 +01:00
madcoin-project
235aef2a06
Update CurrencyUtil.java
2017-11-16 19:41:21 +00:00
Manfred Karrer
1897d892f4
Fix build script and print altcoin list for webpage
2017-11-16 13:58:22 -05:00
Manfred Karrer
e6248b8611
Release candidate v0.6.0
2017-11-16 10:40:39 -05:00
Manfred Karrer
0175c43d9d
Fix display strings. Add info when btc localhost is used
2017-11-16 09:34:07 -05:00
Manfred Karrer
d99461deee
Use new data structure for TradeStatistics
2017-11-15 19:22:11 -05:00
sqrrm
50ffed89cc
Fix some grammar
2017-11-14 19:07:19 +01:00
Chris Beams
05896e3369
Update fee estimate URL from 21.co => earn.com
...
Per the announcement quoted below at
https://news.earn.com/21-co-is-now-earn-com-3e37e50c444f , this change
updates all instances of the bitcoinfees.21.co to bitcoinfees.earn.com.
> Our Bitcoin Fees and Bitnodes services will now be canonically hosted
at bitcoinfees.earn.com and bitnodes.earn.com respectively. You can
still access them via bitcoinfees.21.co and bitnodes.21.co — though
there will be the slight overhead of a 301 redirect, so you should
update to the earn.com versions of the URLs for maximum performance.
2017-11-13 13:02:00 +01:00
Manfred Karrer
2778456b13
Cleanup seed restore screens. Add try/cathc for wallet encryption. Add more warnings when applying seed words.
2017-11-12 21:01:57 -05:00
Manfred Karrer
32180c9fa4
Add <open log file> button to error msg popup
2017-11-12 20:16:31 -05:00
