Mike Rosseel
|
2878db9c0b
|
Merge remote-tracking branch 'origin/DAO' into disk-protobuffer
Conflicts:
common/src/main/java/io/bisq/common/locale/CountryUtil.java
common/src/main/java/io/bisq/common/locale/FiatCurrency.java
core/src/main/java/io/bisq/core/btc/wallet/TradeWalletService.java
core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
core/src/main/java/io/bisq/core/payment/AliPayAccount.java
core/src/main/java/io/bisq/core/payment/ChaseQuickPayAccount.java
core/src/main/java/io/bisq/core/payment/ClearXchangeAccount.java
core/src/main/java/io/bisq/core/payment/FasterPaymentsAccount.java
core/src/main/java/io/bisq/core/payment/InteracETransferAccount.java
core/src/main/java/io/bisq/core/payment/OKPayAccount.java
core/src/main/java/io/bisq/core/payment/PerfectMoneyAccount.java
core/src/main/java/io/bisq/core/payment/SepaAccount.java
core/src/main/java/io/bisq/core/payment/SwishAccount.java
core/src/main/java/io/bisq/core/payment/USPostalMoneyOrderAccount.java
core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerCreateTakerFeeTx.java
core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
core/src/main/java/io/bisq/core/user/BlockChainExplorer.java
core/src/main/java/io/bisq/core/user/Preferences.java
core/src/main/java/io/bisq/core/user/User.java
gui/src/main/java/io/bisq/gui/components/PeerInfoIcon.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java
gui/src/main/java/io/bisq/gui/main/MainViewModel.java
gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java
gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java
gui/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.java
gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java
gui/src/main/java/io/bisq/gui/main/dao/wallet/BalanceUtil.java
gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java
gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java
gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java
gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java
gui/src/main/java/io/bisq/gui/main/offer/OfferView.java
gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java
gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java
gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java
gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java
gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java
gui/src/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java
gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java
gui/src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java
gui/src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java
gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java
gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java
gui/src/main/java/io/bisq/gui/util/BSFormatter.java
gui/src/main/java/io/bisq/gui/util/GUIUtil.java
pom.xml
statistics/src/main/java/io/bisq/statistics/Statistics.java
|
2017-04-10 17:46:27 +02:00 |
|
Mike Rosseel
|
3a7d714385
|
Merge remote-tracking branch 'origin/DAO' into disk-protobuffer
Conflicts:
common/src/main/java/io/bisq/common/locale/CountryUtil.java
common/src/main/java/io/bisq/common/locale/FiatCurrency.java
core/src/main/java/io/bisq/core/btc/wallet/TradeWalletService.java
core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
core/src/main/java/io/bisq/core/payment/AliPayAccount.java
core/src/main/java/io/bisq/core/payment/ChaseQuickPayAccount.java
core/src/main/java/io/bisq/core/payment/ClearXchangeAccount.java
core/src/main/java/io/bisq/core/payment/FasterPaymentsAccount.java
core/src/main/java/io/bisq/core/payment/InteracETransferAccount.java
core/src/main/java/io/bisq/core/payment/OKPayAccount.java
core/src/main/java/io/bisq/core/payment/PerfectMoneyAccount.java
core/src/main/java/io/bisq/core/payment/SepaAccount.java
core/src/main/java/io/bisq/core/payment/SwishAccount.java
core/src/main/java/io/bisq/core/payment/USPostalMoneyOrderAccount.java
core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerCreateTakerFeeTx.java
core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
core/src/main/java/io/bisq/core/user/BlockChainExplorer.java
core/src/main/java/io/bisq/core/user/Preferences.java
core/src/main/java/io/bisq/core/user/User.java
gui/src/main/java/io/bisq/gui/components/PeerInfoIcon.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java
gui/src/main/java/io/bisq/gui/main/MainViewModel.java
gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java
gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java
gui/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.java
gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java
gui/src/main/java/io/bisq/gui/main/dao/wallet/BalanceUtil.java
gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java
gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java
gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java
gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java
gui/src/main/java/io/bisq/gui/main/offer/OfferView.java
gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java
gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java
gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java
gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java
gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java
gui/src/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java
gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java
gui/src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java
gui/src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java
gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java
gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java
gui/src/main/java/io/bisq/gui/util/BSFormatter.java
gui/src/main/java/io/bisq/gui/util/GUIUtil.java
pom.xml
statistics/src/main/java/io/bisq/statistics/Statistics.java
|
2017-04-10 17:46:10 +02:00 |
|
Manfred Karrer
|
30df6f9721
|
Add spend infor to tx outputs. adopt json for txo. add custom encoding for bsq addresses.
|
2017-04-10 00:04:46 -05:00 |
|
Manfred Karrer
|
2f865aa863
|
Add Serbian
|
2017-04-09 16:41:06 -05:00 |
|
riclas
|
7443c79a5c
|
add serbian translation from transifex
|
2017-04-09 22:13:39 +01:00 |
|
Manfred Karrer
|
35e2d09aae
|
Apply bsq fee for taker
|
2017-04-08 20:43:55 -05:00 |
|
Manfred Karrer
|
0efba3827b
|
Force another restart after SPV chain sync at startup
|
2017-04-08 16:00:26 -05:00 |
|
Manfred Karrer
|
ec6f15e7d6
|
Remove static references from Preferences
|
2017-04-07 23:28:48 -05:00 |
|
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
|
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 |
|
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
|
691177d848
|
Fixed translation strings
|
2017-04-04 12:31:55 -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
|
207f14cd78
|
Add spanisch
|
2017-04-01 08:27:11 -05:00 |
|
riclas
|
cef00d22d0
|
full spanish translation from transifex
|
2017-04-01 13:40:31 +01:00 |
|
Mike Rosseel
|
ce6620a291
|
AddressEntryList save/load cycle works
|
2017-03-31 16:44:36 +02: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 |
|
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
|
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
|
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
|
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
|
fdf34283a4
|
Refactor PubKeyRing (WIP)
|
2017-03-27 15:31:25 -05: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
|
8a131dcd75
|
Cleanup
|
2017-03-26 15:34:44 -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 |
|
Manfred Karrer
|
689fb86f80
|
Fix invalid trailing whitespace and quote
|
2017-03-25 18:29:40 -05:00 |
|
Manfred Karrer
|
598291540e
|
Refactoring: Rename all usages of "offerer" with "maker" (excluding translation strings). Separate maker, taker, buyer, seller, buyerAsTaker, BuyerAsMaker, sellerAsMaker and sellerAsTaker in protocol
|
2017-03-25 11:50:08 -05:00 |
|
Manfred Karrer
|
0c08986ccc
|
Fix typo
|
2017-03-25 10:27:15 -05:00 |
|
Manfred Karrer
|
d158b008fb
|
BuyerAsOfferer protocol working with timelock removed (WIP)
|
2017-03-24 19:42:41 -05:00 |
|
Manfred Karrer
|
510dc95ae4
|
Merge changes from master
|
2017-03-23 12:58:04 -05:00 |
|
Manfred Karrer
|
552a151516
|
Add vo module. Refactor Alert to separated classes for all differnet domains (core, vo, proto, payload, persistable)
|
2017-03-21 23:10:55 -05:00 |
|
Mike Rosseel
|
4eedfd22b4
|
Merge remote-tracking branch 'origin/DAO' into disk-protobuffer
Conflicts:
wire/src/main/proto/bsmessage.proto
|
2017-03-21 16:07:28 +01:00 |
|
Mike Rosseel
|
81cf311bc7
|
Merge remote-tracking branch 'origin/DAO' into disk-protobuffer
Conflicts:
wire/src/main/proto/bsmessage.proto
|
2017-03-21 16:07:04 +01:00 |
|
Mike Rosseel
|
00987dadf7
|
wip
|
2017-03-21 07:58:39 +01:00 |
|
Manfred Karrer
|
de7b73f7a9
|
Remove default values in case of null, apply Lombok annotations
|
2017-03-20 23:28:09 -05:00 |
|
Manfred Karrer
|
93531c76d0
|
Apply Lombok annotations, cleanup, check hashcode and equals methods
|
2017-03-20 22:10:10 -05:00 |
|
riclas
|
ee81e059de
|
fix typo and delete hidden character
|
2017-03-20 22:16:34 +00:00 |
|
Manfred Karrer
|
1325def899
|
Change layout of market price icons and label text for market price.
|
2017-03-20 01:14:50 -05:00 |
|
Manfred Karrer
|
48446e454a
|
Refactor price handling
|
2017-03-19 23:44:58 -05:00 |
|
Manfred Karrer
|
af48575b7f
|
Apply code inspection
|
2017-03-16 22:01:25 -05:00 |
|