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 |
|
Manfred Karrer
|
a30e5f4ca1
|
Merge pull request #797 from riclas/patch-4
add serbian translation from transifex
|
2017-04-09 16:29:40 -05:00 |
|
Manfred Karrer
|
c54251d109
|
Cleanup CoinSelectors
|
2017-04-09 16:28:50 -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
|
68ab1b6cb0
|
Fix missing check for isCloseButtonHidden
|
2017-04-08 15:59:46 -05:00 |
|
Manfred Karrer
|
08affae63a
|
Use getter/setter instead of public fields in PlaceOfferModel
|
2017-04-08 12:17:22 -05:00 |
|
Manfred Karrer
|
8f06131a58
|
Remove redundant data from createOfferModel
|
2017-04-08 12:13:05 -05:00 |
|
Manfred Karrer
|
7dfe245827
|
Rename MakerFeeTx to CreateMakerFeeTx
|
2017-04-08 12:07:37 -05:00 |
|
Manfred Karrer
|
174b126017
|
Rename TakerCreateTakerFeeTx to CreateTakerFeeTx
|
2017-04-08 12:07:04 -05:00 |
|
Manfred Karrer
|
ec6f15e7d6
|
Remove static references from Preferences
|
2017-04-07 23:28:48 -05:00 |
|
Manfred Karrer
|
7ca02c0be6
|
Fix issue with static initializer
|
2017-04-07 20:08:53 -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
|
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 |
|