mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 23:06:39 +01:00
Code Issues Projects Releases Packages Wiki Activity
3446 commits 3 branches 150 tags 4.1 GiB
Commit graph

319 commits

Author SHA1 Message Date
Manfred Karrer
76e031bbb2
Merge Development 2017-09-18 11:48:25 -05:00
Manfred Karrer
23828c3e79
Remove some altcoins, add comment 2017-09-18 11:46:04 -05:00
Manfred Karrer
2357e6c399
Add missing altcoins (WAC, PNC, ZEN) 2017-09-18 08:56:34 -05:00
Manfred Karrer
97396cbd2d
Add altcoin DEC 2017-09-18 08:38:06 -05:00
Manfred Karrer
b72d716910
Merge Development 2017-09-17 11:28:34 -05:00
Manfred Karrer
50106990ba
Merge branch 'master' into Development 
Merge master to Development
 2017-09-16 12:28:49 -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
Chris Beams
0f2145d19c
Rename bisq-network/{bisq-exchange => exchange} 
This is a follow on to 6ffa52a00. bisq-network/bisq-exchange is too
verbose, and other repositories have been shortened as well, e.g.
bisq-network/price-relay-node has become bisq-network/pricenode.
 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
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
6ffa52a006
Rename bitsquare/bitsquare => bisq-network/bisq-exchange 2017-08-23 15:36:17 +02:00
stevenkain
a3b1a5ff6a Update displayStrings.properties 
Senders name -> Sender's name
 2017-08-10 16:54:45 +03:00
stevenkain
fd683db2d4 Update displayStrings.properties 2017-08-09 19:14:42 +03:00
Manfred Karrer
a7c0f1d16f Merge branch 'Development' into DAO_phase1 2017-08-09 12:48:56 +02:00
Manfred Karrer
e8c46c9709 Merge branch 'master' into Development 
# Conflicts:
#	doc/build.md
 2017-08-09 12:48:07 +02:00
stevenkain
c92f955060 Update displayStrings.properties 2017-08-04 21:57:03 +03:00
Manfred Karrer
94203b9101 Add BSQ dashboard/statistics 2017-07-29 03:09:39 +02:00
Manfred Karrer
2a67d39d53 Cleanup 2017-07-29 00:04:31 +02:00
Manfred Karrer
5b5c0e66c7 Improve wording 2017-07-28 20:04:38 +02:00
Manfred Karrer
2f322f7a33 Merge branch 'Development' into DAO_phase1 2017-07-27 17:12:24 +02:00
Manfred Karrer
2d6fa2be6f Move removeCryptographyRestrictions method to Utilities and add static initializer to SeedNodeMain, ProviderMain and StatisticsMain 2017-07-27 17:12:14 +02:00
Manfred Karrer
c744cb5a96 Merge branch 'Development' into DAO_phase1 2017-07-26 21:38:21 +02:00
Mike Rosseel
592bea9dad make a tradeProtocol getter for api use, cleanup protobuf in main pom and move protobuf-util to common like the other protobuf dependency. Also make it visible outside of test 2017-07-26 16:37:59 +02:00
Manfred Karrer
ba2fc3c162 Merge branch 'Development' into DAO_phase1 2017-07-26 13:21:07 +02:00
Manfred Karrer
b6c5d872bd Add all african counties 2017-07-26 13:17:08 +02:00
Manfred Karrer
1857cc0b30 Show latest trade price as market price for currencies which have no external price feed provided but have been traded in Bisq 2017-07-26 11:44:28 +02:00
Manfred Karrer
03c33964a7 Add more selectors to filter. 2017-07-26 00:07:44 +02:00
Manfred Karrer
894923fb5e Enable dev mode 2017-07-25 22:14:35 +02:00
Manfred Karrer
40fd9a664b Enable BSQ 2017-07-25 22:14:27 +02:00
Manfred Karrer
72a7104f94 Refactoring: Merge BsqBlockVo into BsqBlock, TxInputVo into TxInput and TxOutputVo into TxOutput 2017-07-24 20:05:50 +02:00
Manfred Karrer
87ba5cabeb Add IOTA and EOS 2017-07-24 19:26:47 +02:00
Manfred Karrer
a7f3d68cb1 Version 0.5.3 with hotfix for fixing wrong app data name (bisq was renamed to Bisq -> we rename the app data dir). 2017-07-17 10:05:08 +02:00
Manfred Karrer
225fdb1e46 Version 0.5.2 2017-07-17 01:27:47 +02:00
Manfred Karrer
b7d8a0acb6 set version 0.5.2 2017-07-16 16:29:10 +02:00
Manfred Karrer
ca6a9ae9a5 disable dev mode 2017-07-16 16:28:50 +02:00
Manfred Karrer
97faeb1ef9 Use static method renameFile 2017-07-16 03:10:37 +02:00
Manfred Karrer
25f9368990 Add info for wallet restore 2017-07-16 02:35:03 +02:00
Manfred Karrer
9cb0134369 Add reminder for seed word and backup before setting the wallet pw 2017-07-16 00:53:11 +02:00
Manfred Karrer
51e8aae991 Add email again but set to empty string as otherwise it would break backward compatibility (hash of contract) 2017-07-16 00:34:46 +02:00
Manfred Karrer
04fa5f079f Remove email from bank accounts and fasterpayment 2017-07-15 23:09:13 +02:00
Manfred Karrer
f8ed97cb2e Merge branch 'Development' into 0.5.2 
# Conflicts:
#	core/src/main/java/io/bisq/core/payment/payload/PaymentMethod.java
 2017-07-15 14:57:42 +02:00
Manfred Karrer
ca9e53a2ab Remove email from sepa account 2017-07-15 13:12:09 +02:00
Mike Rosseel
b2f6d7435c added dash as base currency 2017-07-14 20:20:19 +02:00
Manfred Karrer
1d5965e296 Merge remote-tracking branch 'origin/0.5.2' into 0.5.2 2017-07-14 11:43:23 +02:00
Manfred Karrer
2a55758d3b Merge branch 'Development' into 0.5.2 2017-07-14 11:42:16 +02:00
Manfred Karrer
4b5b305389 Merge branch 'master' into Development 2017-07-14 11:41:39 +02:00
Manfred Karrer
6bbac2903b Change version nr back to 0.5.1 (0.5.2 is not ready yet) 2017-07-14 11:41:20 +02:00