Manfred Karrer
01cf823d7a
Prepare merge Dev
2017-10-11 07:21:50 -05:00
Manfred Karrer
ca71f4464f
Put altcoin Ellaism to right position in list
2017-10-08 21:15:38 -05:00
Manfred Karrer
8ac5d51bdd
Merge branch 'ellaismer-Development' into Development
2017-10-08 21:14:51 -05:00
Manfred Karrer
a8c81871c9
Merge branch 'Development' of https://github.com/ellaismer/exchange into ellaismer-Development
2017-10-08 21:12:02 -05:00
Manfred Karrer
e5738507c3
Merge branch 'master' into Development
2017-10-06 20:57:32 -05:00
Manfred Karrer
fe91c8ee76
Set phase 0 genesis tx
2017-10-06 14:28:50 -05:00
Manfred Karrer
52dd76bd9a
Remove inactive blockexplorer blockr.io
2017-10-06 12:43:59 -05:00
Manfred Karrer
99dc2f710a
Merge branch 'riclas-patch-6'
2017-09-30 13:16:35 -05:00
riclas
ae4212c567
created properties file for Simplified Chinese from transifex
2017-09-30 19:05:16 +01:00
Manfred Karrer
e6498e2659
Remove pre-filled entries in ManualPayoutTxWindow
2017-09-26 09:06:12 -05:00
Manfred Karrer
da2b12f71a
Rename SpendFromDepositTxWindow to ManualPayoutTxWindow
2017-09-26 08:47:55 -05:00
Manfred Karrer
c3320123c5
Add log for invalid arbitrators
2017-09-25 08:55:55 -05:00
Manfred Karrer
e73cd7abe2
Fix typos
2017-09-22 08:33:38 -05:00
Ellaismer
a61f37b6e1
Add Ellaism coin
2017-09-21 04:38:36 +08:00
Manfred Karrer
bd6eeb987b
Merge branch 'ManfredKarrer-Development' into Development
2017-09-18 08:57:26 -05:00
Manfred Karrer
2357e6c399
Add missing altcoins (WAC, PNC, ZEN)
2017-09-18 08:56:34 -05:00
Manfred Karrer
0d4eca6309
Merge branch 'Roznovjak-Development' into Development
2017-09-18 08:38:23 -05:00
Manfred Karrer
97396cbd2d
Add altcoin DEC
2017-09-18 08:38:06 -05:00
Roznovjak
8e7e720bb7
Update AltCoinAddressValidatorTest.java
...
DCT integration
2017-09-18 15:03:03 +02:00
Roznovjak
668e9758af
Update AltCoinAddressValidator.java
...
DCT integration
2017-09-18 14:58:35 +02:00
Manfred Karrer
02b9d9153f
Merge branch 'Development' of https://github.com/ManfredKarrer/exchange into Development
2017-09-17 10:33:26 -05:00
Manfred Karrer
70392c21c1
Merge branch 'SMH17-patch-3' into Development
2017-09-17 10:22:37 -05:00
Manfred Karrer
3fe8b848d8
Merge branch 'patch-3' of https://github.com/SMH17/bitsquare into SMH17-patch-3
2017-09-17 10:21:42 -05:00
Manfred Karrer
1ba98d4283
Merge branch 'ManfredKarrer-Development' into Development
2017-09-17 10:19:30 -05:00
Manfred Karrer
1aa3038a07
Merge WACoin
2017-09-17 10:16:00 -05:00
Manfred Karrer
50106990ba
Merge branch 'master' into Development
...
Merge master to Development
2017-09-16 12:28:49 -05:00
Manfred Karrer
0087e19db9
Merge branch 'ZencashOfficial-Development' into Development
...
Merge Zencash PR 919
2017-09-16 12:23:07 -05:00
Manfred Karrer
7daee4f212
Remove comment
2017-09-16 12:22:20 -05:00
Manfred Karrer
262c947d85
Merge PR 919 (ZenCash)
2017-09-16 12:16:54 -05:00
Manfred Karrer
c6e5f7882d
Merge pull request #924 from Pranacoin/Development
...
Add new altcoin with code "PNC"
2017-09-16 11:08:56 -05:00
Manfred Karrer
71ce1bdade
Merge pull request #931 from ManfredKarrer/master
...
Fix broken links and remove a developer log
2017-09-16 10:33:10 -05:00
Manfred Karrer
a9b1a9bd5b
Remove single opening quote in dispute message
2017-09-16 10:31:52 -05:00
Manfred Karrer
13a95317bc
Fix broken link to Arbitration system
2017-09-16 10:25:10 -05:00
Manfred Karrer
9c77da778e
Remove developer log
2017-09-16 10:11:39 -05:00
Manfred Karrer
b723f28edc
Merge remote-tracking branch 'origin/master'
2017-09-13 20:00:04 -05:00
Manfred Karrer
b99b268f12
Update EntryMap_BTC to actual state
2017-09-13 19:59:37 -05:00
Казьмина Татьяна
daaeddb968
Add new altcoin with code "PNC": additional code in AltCoinAddressValidator and AltCoinAddressValidatorTest and 2 specific classes: PNCAddressValidator and PNCParams.
2017-09-09 15:23:00 +03:00
smrtz
728e178828
Adds ZenCash Support
2017-09-05 18:38:59 -04:00
Chris Beams
0f2145d19c
Rename bisq-network/{bisq-exchange => exchange}
...
This is a follow on to 6ffa52a00
2017-09-05 14:55:42 +02:00
Manfred Karrer
902e3de80a
Rename ShadowCash to Particl ( https://github.com/bisq-network/bisq-exchange/issues/911 )
2017-08-27 12:42:01 +02:00
Manfred Karrer
1eee939754
Merge pull request #912 from stevenkain/patch-4
...
Update displayStrings.properties
2017-08-26 09:41:45 +02:00
stevenkain
2fb74f4936
Update displayStrings.properties
2017-08-25 23:35:15 +03:00
stevenkain
aa87319fca
Update displayStrings.properties
2017-08-25 23:34:30 +03:00
stevenkain
50310338b4
Update displayStrings.properties
2017-08-25 23:05:06 +03:00
Chris Beams
ede1f90167
Upgrade to latest HEAD of our libdohj fork
2017-08-23 15:43:36 +02:00
Chris Beams
6ffa52a006
Rename bitsquare/bitsquare => bisq-network/bisq-exchange
2017-08-23 15:36:17 +02:00
Chris Beams
391910576b
Update to depend on latest commit in libdohj-core
...
Depending on this commit ensures that we do not transitively depend on
bitcoinj snapshots.
2017-08-21 16:22:11 +02:00
WACoinsTeam
41450d7543
Add WACoins coin
2017-08-20 21:51:54 +02:00
Manfred Karrer
8747f0e099
Merge pull request #904 from stevenkain/patch-3
...
Update displayStrings.properties
2017-08-10 16:17:49 +02:00
stevenkain
a3b1a5ff6a
Update displayStrings.properties
...
Senders name -> Sender's name
2017-08-10 16:54:45 +03:00
