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
3639 commits 3 branches 150 tags 4.1 GiB
Commit graph

3639 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Manfred Karrer
3af381957f Fix missing state reset. dont delay if we switch trades 2017-03-27 23:30:27 -05:00
Manfred Karrer
1215834864 Remove Alert delegates 2017-03-27 23:16:23 -05:00
Manfred Karrer
22287a25e0 Added Iran 2017-03-27 22:51:33 -05:00
Manfred Karrer
0b5c9651a4 Refactoring: Use CoreProtobufferResolver in core and interface to decouple network and domain. Remove protobuffer and vo modules. 2017-03-27 22:47:53 -05:00
Manfred Karrer
d4895bb907 Fix missing handling for trade state 2017-03-27 22:45:35 -05:00
Manfred Karrer
100bfc2101 Use ProtobufferResolver in core 2017-03-27 20:29:42 -05:00
Manfred Karrer
8f8f452b16 Revert PubKey changes 2017-03-27 19:38:37 -05:00
Manfred Karrer
242f816b4e Refactor: Rename KeyRingVo to KeyRing 2017-03-27 16:11:08 -05:00
Manfred Karrer
3f53dd3fd8 Refactor: Move static methods from EncryptionService to NetworkCryptoUtils 2017-03-27 15:39:32 -05:00
Manfred Karrer
eeb0bd45e0 Refactor: Move ProtoCryptoUtil methods to EncryptionService 2017-03-27 15:37:10 -05:00
Manfred Karrer
ba25a181a7 Refactor PubKeyRing (WIP) 2017-03-27 15:31:42 -05:00
Manfred Karrer
fdf34283a4 Refactor PubKeyRing (WIP) 2017-03-27 15:31:25 -05:00
Mike Rosseel
3f1793692f Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	core/src/main/java/io/bisq/core/arbitration/DisputeManager.java
	core/src/main/java/io/bisq/core/payment/PaymentAccount.java
	core/src/main/java/io/bisq/core/trade/TradeManager.java
	core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerPublishTakerFeeTx.java
	network/src/main/java/io/bisq/network/p2p/DecryptedMsgWithPubKey.java
	network/src/main/java/io/bisq/network/p2p/storage/P2PDataStorage.java
	protobuffer/src/main/java/io/bisq/protobuffer/message/offer/OfferAvailabilityResponse.java
	protobuffer/src/main/java/io/bisq/protobuffer/payload/arbitration/DisputeResult.java
	protobuffer/src/main/java/io/bisq/protobuffer/payload/offer/OfferPayload.java
	protobuffer/src/main/java/io/bisq/protobuffer/payload/trade/statistics/TradeStatistics.java
	protobuffer/src/main/proto/pb.proto
 2017-03-27 10:58:09 +02:00
Mike Rosseel
a05ae36acc Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	core/src/main/java/io/bisq/core/arbitration/DisputeManager.java
	core/src/main/java/io/bisq/core/payment/PaymentAccount.java
	core/src/main/java/io/bisq/core/trade/TradeManager.java
	core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerPublishTakerFeeTx.java
	network/src/main/java/io/bisq/network/p2p/DecryptedMsgWithPubKey.java
	network/src/main/java/io/bisq/network/p2p/storage/P2PDataStorage.java
	protobuffer/src/main/java/io/bisq/protobuffer/message/offer/OfferAvailabilityResponse.java
	protobuffer/src/main/java/io/bisq/protobuffer/payload/arbitration/DisputeResult.java
	protobuffer/src/main/java/io/bisq/protobuffer/payload/offer/OfferPayload.java
	protobuffer/src/main/java/io/bisq/protobuffer/payload/trade/statistics/TradeStatistics.java
	protobuffer/src/main/proto/pb.proto
 2017-03-27 10:56:53 +02:00
Mike Rosseel
1ad12f091c saving to disk of AddressEntryList works, now crashes on reading 2017-03-27 08:44:49 +02:00
Manfred Karrer
9485971751 Check for market price age on client. Allow max. 30 min old market prices 2017-03-26 23:11:40 -05:00
Manfred Karrer
e1185961c0 Persist last used payment account for create offer screen 2017-03-26 22:15:40 -05:00
Manfred Karrer
7f71d260e1 Add mediator to trade process 2017-03-26 21:52:08 -05:00
Manfred Karrer
c7841e8d14 Remove old code for backward compatibility. Cleanup. Improve version check 2017-03-26 15:52:06 -05:00
Manfred Karrer
8a131dcd75 Cleanup 2017-03-26 15:34:44 -05:00
Manfred Karrer
94a44b6c99 Add emailAddress to arbitr. and mediator. Add PGPPubKey to PubKeyRing 2017-03-26 15:21:39 -05:00
Manfred Karrer
d551c056c1 Refactor trade state and phase. support correct handling for payment limits in offer 2017-03-26 12:40:16 -05:00
Manfred Karrer
a26c5b5d7a Refactor trade state and phase. new trade process works so far (WIP) 2017-03-25 23:36:51 -05:00