Manfred Karrer
|
28eed63e0f
|
Move provider and app package form network to core
|
2017-03-16 17:00:09 -05:00 |
|
Manfred Karrer
|
f174024ac7
|
Move local to common, refactor setting of default locale
|
2017-03-16 16:56:47 -05:00 |
|
Manfred Karrer
|
63456ac255
|
Move Offer and User domain classes to core
|
2017-03-16 16:37:37 -05:00 |
|
Manfred Karrer
|
48b94c23ef
|
Merge pull request #777 from bitsquare/proto-fix
proto camelcase fix
|
2017-03-16 15:01:34 -05:00 |
|
Mike Rosseel
|
9d9c6e9904
|
proto camelcase fix
|
2017-03-16 20:49:49 +01:00 |
|
Manfred Karrer
|
23b86922ad
|
Fix missing impl at Utilities.getFeePerByte. Move btcj dependent methods from common Utilities to CoinUtil in core.
|
2017-03-16 13:26:58 -05:00 |
|
Manfred Karrer
|
f31dd06330
|
Merge branch 'MarketPriceTTL' into DAO
|
2017-03-16 13:03:03 -05:00 |
|
Manfred Karrer
|
ccb060193e
|
Adpot changes to merged branch
|
2017-03-16 12:59:17 -05:00 |
|
Manfred Karrer
|
34b4c61792
|
Merge branch 'separateSecDeposit' into DAO
# Conflicts:
# gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
# gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java
# gui/src/main/java/io/bisq/gui/main/overlays/windows/DisputeSummaryWindow.java
# network-messages/src/main/java/io/bisq/network_messages/trade/offer/payload/OfferPayload.java
# network/src/main/java/io/bisq/p2p/network/ProtoBufferUtilities.java
# network/src/test/java/io/bisq/p2p/storage/P2PDataStorageTest.java
|
2017-03-16 12:28:59 -05:00 |
|
Manfred Karrer
|
ae2cdcae72
|
Merge branch 'temp' into DAO
|
2017-03-16 12:22:00 -05:00 |
|
Manfred Karrer
|
366522444d
|
Fix bug with missing !. Use equals check instead of != check for networkParams
|
2017-03-16 12:00:38 -05:00 |
|
Manfred Karrer
|
6d895bee79
|
Add temp node addresses for seed node and provider
|
2017-03-16 11:59:57 -05:00 |
|
Manfred Karrer
|
35363b2725
|
Remove policy flags
|
2017-03-16 11:59:29 -05:00 |
|
Manfred Karrer
|
f677e7f6a4
|
change to io.bisq.bisq ID
|
2017-03-16 11:59:15 -05:00 |
|
Manfred Karrer
|
ae9016ca10
|
Remove policy flags
|
2017-03-16 11:59:00 -05:00 |
|
Manfred Karrer
|
7992e081d8
|
Merge pull request #776 from bitsquare/messages-refactoring
Messages refactoring
|
2017-03-16 11:56:28 -05:00 |
|
Mike Rosseel
|
7ed46912cb
|
move tests
|
2017-03-16 17:08:27 +01:00 |
|
Mike Rosseel
|
4a56abbf0b
|
renamed package name to conform to module
|
2017-03-16 16:57:21 +01:00 |
|
Mike Rosseel
|
bd65f274aa
|
move the last messages to the correct module
|
2017-03-16 16:50:53 +01:00 |
|
Mike Rosseel
|
d89e8e98d1
|
move the last messages to the correct module
|
2017-03-16 16:48:54 +01:00 |
|
Mike Rosseel
|
e0151df520
|
fix bugs and replace errors
|
2017-03-16 15:33:45 +01:00 |
|
Mike Rosseel
|
7920fcb105
|
new files (or moves which intellij didn't recognize)
|
2017-03-16 14:39:17 +01:00 |
|
Mike Rosseel
|
2efc3acb29
|
split network-messages in its own module. Compiles.
|
2017-03-16 14:38:18 +01:00 |
|
Manfred Karrer
|
436a7400d9
|
Add PersistedP2PStorageData (need to be updated when data structure changes)
|
2017-03-15 20:32:28 -05:00 |
|
Manfred Karrer
|
5afd2bde11
|
Separate security deposit for buyer and seller. Remove arbitrator amount and address at dispute result. Remove Payout policy. Add bank as reason.
|
2017-03-15 17:06:44 -05:00 |
|
Manfred Karrer
|
a4b15f5906
|
Separate security deposit for buyer and seller (WIP)
|
2017-03-15 15:04:32 -05:00 |
|
Manfred Karrer
|
97957663fd
|
Use TTL of 30 min. for market prices.
|
2017-03-15 11:12:34 -05:00 |
|
Manfred Karrer
|
e65502b9e8
|
Merge remote-tracking branch 'origin/DAO' into DAO
|
2017-03-14 16:11:47 -05:00 |
|
Manfred Karrer
|
b008a5dd76
|
Fix wrong entry
|
2017-03-14 16:10:54 -05:00 |
|
Mike Rosseel
|
ba5bed13b2
|
Merge branch 'DAO' of github.com:bitsquare/bitsquare into DAO
|
2017-03-14 11:53:47 +01:00 |
|
Manfred Karrer
|
74d265d197
|
Do check for correct crypt setup before any services are initialized
|
2017-03-13 16:34:48 -05:00 |
|
Manfred Karrer
|
26159e4555
|
Remove display string popup.warning.noBountyCastle
|
2017-03-13 16:34:16 -05:00 |
|
Mike Rosseel
|
550be11d00
|
field name change
|
2017-03-13 15:58:00 +01:00 |
|
Mike Rosseel
|
2ad93c0ac5
|
protobuffer documentation WIP
|
2017-03-13 15:57:28 +01:00 |
|
Manfred Karrer
|
5fdcbd12c4
|
Merge pull request #774 from bitsquare/issue773
Fix issue 773: Protobuffer: arbitratorAddressAsString is null
|
2017-03-13 07:15:20 -05:00 |
|
Mike Rosseel
|
412da90ccc
|
remove TODO
|
2017-03-13 10:26:34 +01:00 |
|
Mike Rosseel
|
c6e51fdeca
|
fix bug where the DisputeResult was not correctly deserialized.
Added ctor with all transmitted data.
|
2017-03-13 10:23:44 +01:00 |
|
Manfred Karrer
|
d68b3e4862
|
Add comments to translation files
|
2017-03-12 22:52:34 -05:00 |
|
Manfred Karrer
|
7949dc0f6e
|
Add comments to translation files
|
2017-03-12 22:49:58 -05:00 |
|
Manfred Karrer
|
56db3c6217
|
Use maker instead of offerer and maker fee instead offer fee as well as taker fee instead "take offer fee"
|
2017-03-12 22:38:31 -05:00 |
|
Manfred Karrer
|
8527762154
|
Fix incorrect/missing display strings, fix null pointer, cleanup
|
2017-03-12 22:31:23 -05:00 |
|
Manfred Karrer
|
9ff23016c8
|
Fix incorrect display strings
|
2017-03-12 16:14:32 -05:00 |
|
Manfred Karrer
|
3b557463da
|
Rebranding: replace bitsquare with bisq
|
2017-03-12 16:00:40 -05:00 |
|
Manfred Karrer
|
0435c88717
|
Add missing displaystrings
|
2017-03-12 15:59:59 -05:00 |
|
Manfred Karrer
|
be1096582c
|
Rebranding: rename package io.bitsquare to io.bisq
|
2017-03-12 15:09:39 -05:00 |
|
Manfred Karrer
|
75fc7d2286
|
Rebranding: Change occurance of Bitsquare to bisq
|
2017-03-12 14:28:14 -05:00 |
|
Manfred Karrer
|
46995c102c
|
Resolve merge conflicts, move locale package to common, use constancts for dev keypair.
|
2017-03-12 13:46:40 -05:00 |
|
Manfred Karrer
|
5b557ed37a
|
Merge branch 'doa_with_translations' into DAO
# Conflicts:
# common/src/main/java/io/bitsquare/app/DevFlags.java
# gui/src/main/java/io/bitsquare/gui/components/PeerInfoIcon.java
# gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java
# gui/src/main/java/io/bitsquare/gui/components/paymentmethods/CryptoCurrencyForm.java
# gui/src/main/java/io/bitsquare/gui/components/paymentmethods/OKPayForm.java
# gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PaymentMethodForm.java
# gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PerfectMoneyForm.java
# gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SameBankForm.java
# gui/src/main/java/io/bitsquare/gui/main/MainView.java
# gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
# gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java
# gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java
# gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java
# gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java
# gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java
# gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java
# gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
# gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.java
# gui/src/main/java/io/bitsquare/gui/main/dao/compensation/create/CreateCompensationRequestView.java
# gui/src/main/java/io/bitsquare/gui/main/dao/wallet/send/BsqSendView.java
# gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
# gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
# gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.java
# gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
# gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java
# gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.java
# gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.java
# gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java
# gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java
# gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java
# gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
# gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
# gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
# gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
# gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java
# gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/editor/PeerInfoWithTagEditor.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/ContractWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/FilterWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendPrivateNotificationWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java
# gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java
# gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
# gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
# gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
# gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
# gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java
# gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java
# gui/src/main/java/io/bitsquare/gui/util/validation/BankIdValidator.java
# gui/src/main/java/io/bitsquare/gui/util/validation/BranchIdValidator.java
# gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java
# gui/src/main/java/io/bitsquare/gui/util/validation/SecurityDepositValidator.java
# network/src/main/java/io/bitsquare/messages/provider/price/PriceFeedService.java
# network/src/main/java/io/bitsquare/messages/trade/offer/payload/Offer.java
|
2017-03-12 12:50:36 -05:00 |
|
Manfred Karrer
|
1a634d919f
|
cleanup
|
2017-03-12 12:23:53 -05:00 |
|
Manfred Karrer
|
47839bede7
|
Add german from old translation (not complete). cleanup
|
2017-03-12 11:34:02 -05:00 |
|