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

3762 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
3cab62ed22 Use same layout for TakeOfferView as in CreateOfferView 2017-04-07 16:25:42 -05:00
Manfred Karrer
eacf30ce6d Support BSQ as trade fee currency in CreateOfferView and TakeOfferView (WIP) 2017-04-07 15:31:58 -05:00
Manfred Karrer
fba188d0b3 Add com.fasterxml.jackson to pom again to avoid runtime exception 2017-04-07 15:12:14 -05:00
Mike Rosseel
a448444bf1 guice debugging 2017-04-07 20:53:16 +02:00
Mike Rosseel
03c1b4970b dependency fixes 2017-04-07 11:20:15 +02:00
Mike Rosseel
8a352a91e5 preference debugging 2017-04-07 10:53:38 +02:00
Manfred Karrer
1783441ac6 Rename CreateOfferFee to Maker fee. Add isCurrencyForMakerFeeBtc to OfferPayload. use StringUtils.deleteWhitespace instead of String.replace. 2017-04-06 15:24:38 -05:00
Mike Rosseel
67c70bf138 Preferences refactoring 2017-04-06 15:28:08 +02:00
Manfred Karrer
c6d96eba71 Add toggle for BSQ trade fee at create offer view. Add txs for using BSQ for trade fee. Add button to settings to delete spv chain file. 2017-04-06 00:34:48 -05:00
Manfred Karrer
7b9450eafc Add json for explorer (WIP) 2017-04-05 10:35:24 -05:00
Mike Rosseel
30a2876538 everything should now be Persistable, also HashSet, HashMap, Long, ... . 
commit before Preferences refactoring.
 2017-04-05 14:18:01 +02:00
Manfred Karrer
f1054446db Update guice version. Add utxo_provider module. 2017-04-04 21:54:02 -05:00
Manfred Karrer
0046a6384a Cleanup 2017-04-04 15:06:59 -05:00
Manfred Karrer
a78d8fe592 Use sorting of txs instead of map (WIP) 2017-04-04 14:48:29 -05:00
Manfred Karrer
8bb9b8659d Fix log formatting. 2017-04-04 13:33:05 -05:00
Manfred Karrer
691177d848 Fixed translation strings 2017-04-04 12:31:55 -05:00
Manfred Karrer
cd591b9f9e Add snapshot mechanism for persisting utxo map 2017-04-04 01:00:32 -05:00
Manfred Karrer
d280e850b6 Make UTXOMap and TXOMap persistable 2017-04-03 23:13:17 -05:00
Manfred Karrer
0cf3072902 Dont use tor if regtest. Dont use tor for provider node if localhost 2017-04-03 22:11:29 -05:00
Manfred Karrer
fddf83b7ab Fix incorrect placeholders 2017-04-03 16:19:02 -05:00
Manfred Karrer
986ac67f84 Keep historical bsq txos for displaying bss txs in tx list. refactor data structure. detect invalid bsq tx and show popup. 2017-04-03 16:02:33 -05:00
Manfred Karrer
0386f1e739 Fix BSQ algo, add tx view 2017-04-02 20:19:03 -05:00
Manfred Karrer
db966ca01c Add missing dependency to pom. Map callbacks to userthread 2017-04-01 12:16:25 -05:00
Manfred Karrer
e96e408e33 Fix incorrect handling of logical and/or. Rename rpc optionkeys. Use lombok in BSQ tx value objcts. Use map with txId, index tuple instead of nested map for utxo. Rename BSQ Tx classes. Fix BSQ parsing algo. Add and improve tests. 2017-04-01 11:41:13 -05:00
Manfred Karrer
207f14cd78 Add spanisch 2017-04-01 08:27:11 -05:00
Manfred Karrer
c6076c4dff Merge pull request #793 from riclas/patch-3 
full spanish translation from transifex
 2017-04-01 08:16:25 -05:00
riclas
cef00d22d0 full spanish translation from transifex 2017-04-01 13:40:31 +01:00
Mike Rosseel
036031265d toproto for prefs 2017-04-01 14:28:51 +02:00
Mike Rosseel
ce6620a291 AddressEntryList save/load cycle works 2017-03-31 16:44:36 +02:00
Manfred Karrer
34ca2ecf28 Add OctoCoin 2017-03-30 21:18:19 -05:00
Manfred Karrer
17edfdb51f Merge pull request #792 from my-first/master 
Finish adding Octocoin
 2017-03-30 21:15:05 -05:00
Manfred Karrer
1d9113499d Merge branch 'Development' into master 2017-03-30 21:14:57 -05:00
MyFirst
efb1689eb3 Fix missing P2SH prefix in validation regex 2017-03-30 16:09:31 -04:00
MyFirst
f9c4bb730c Fix Typos in Octocoin validation 2017-03-30 15:29:33 -04:00
MyFirst
23c4768d29 Rename OctocoinAddressValidator to OctocoinAddressValidator.java 2017-03-30 15:01:59 -04:00
Manfred Karrer
4c8f20d237 Fixed some OctroCoin bugs. Tests still failing. Need fix 2017-03-30 09:24:30 -05:00
Manfred Karrer
928668004a Merge pull request #790 from my-first/master 
Add Octocoin
 2017-03-30 09:09:00 -05:00
Mike Rosseel
f1ef154b61 Merge remote-tracking branch 'origin/keyBagSupplier' into disk-protobuffer 
Conflicts:
	core/src/main/java/io/bisq/core/btc/AddressEntry.java
 2017-03-30 09:53:51 +02:00
MyFirst
8462867afe Fix P2SH 2017-03-30 02:09:27 -04:00
MyFirst
38b66e7f9a Add Octocoin 2017-03-30 01:25:55 -04:00
MyFirst
2e8bc02b5d Add Octocoin 2017-03-30 01:09:04 -04:00
MyFirst
d2190efb66 Add Octocoin 2017-03-30 01:07:33 -04:00
MyFirst
cb4716e85f Add Octcoin 2017-03-30 01:02:33 -04:00
Manfred Karrer
3a28321053 Merge pull request #789 from riclas/patch-2 
complete the german translation from transifex
 2017-03-29 16:20:16 -05:00
riclas
b58ed0ec36 complete the german translation from transifex 
updated the german translation file with all the strings from transifex
 2017-03-29 22:15:17 +01:00
Manfred Karrer
31b310e59b Use KeyBagSupplier in ProtoResolver 2017-03-29 12:14:46 -05:00
Manfred Karrer
d00b8e6c90 Rename AlertProto to Alert in proto definition 2017-03-28 19:45:49 -05:00
Mike Rosseel
3ec71f25ce compilation fixes 2017-03-28 09:01:24 +02:00
Mike Rosseel
bcc93ca602 Merge branch 'DAO' into disk-protobuffer + small changes 
Conflicts:
	core/src/main/java/io/bisq/core/arbitration/Dispute.java
	core/src/main/java/io/bisq/core/arbitration/DisputeManager.java
	core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
	network/src/main/java/io/bisq/network/p2p/DecryptedMsgWithPubKey.java
	network/src/main/java/io/bisq/network/p2p/storage/P2PDataStorage.java
 2017-03-28 08:17:20 +02:00
Manfred Karrer
bc6f8d5460 Rename Message to Msg (Message is used in protobuffer as well) 2017-03-27 23:31:09 -05:00