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
|
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
|
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 |
|
Mike Rosseel
|
4a56abbf0b
|
renamed package name to conform to module
|
2017-03-16 16:57:21 +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
|
2efc3acb29
|
split network-messages in its own module. Compiles.
|
2017-03-16 14:38:18 +01: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
|
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 |
|
Manfred Karrer
|
05678353d7
|
Add missing display strings (GUIUtils, validations)
|
2017-03-12 02:16:35 -05:00 |
|
Manfred Karrer
|
055d505ba6
|
Add missing display strings
|
2017-03-12 01:37:47 -05:00 |
|
Manfred Karrer
|
1af33f4d9c
|
Apply display strings for formatter and arb selection
|
2017-03-12 01:15:50 -05:00 |
|
Manfred Karrer
|
ea3f5ebf26
|
Apply display strings for payment classes
|
2017-03-12 00:18:31 -05:00 |
|
Manfred Karrer
|
f01d461abe
|
Add dev keys for alert, priv. notification and filter. add comments to devflags
|
2017-03-10 20:44:51 -05:00 |
|
Mike Rosseel
|
fed47a0342
|
Merge branch 'DAO' into protobuffer
Conflicts:
common/src/main/java/io/bitsquare/app/Log.java
core/src/main/java/io/bitsquare/arbitration/ArbitratorManager.java
core/src/main/java/io/bitsquare/btc/BitcoinModule.java
core/src/main/java/io/bitsquare/btc/wallet/BsqWalletService.java
core/src/main/java/io/bitsquare/btc/wallet/TradeWalletService.java
core/src/main/java/io/bitsquare/btc/wallet/WalletService.java
core/src/main/java/io/bitsquare/btc/wallet/WalletsSetup.java
core/src/main/java/io/bitsquare/dao/DaoModule.java
core/src/main/java/io/bitsquare/dao/vote/VotingManager.java
gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.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/voting/vote/VoteView.java
gui/src/main/java/io/bitsquare/gui/main/dao/wallet/send/BsqSendView.java
gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java
gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadViewModel.java
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java
network/pom.xml
network/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
network/src/main/java/io/bitsquare/messages/alert/Alert.java
network/src/main/java/io/bitsquare/messages/btc/provider/fee/FeeService.java
network/src/main/java/io/bitsquare/messages/trade/offer/payload/Offer.java
network/src/main/java/io/bitsquare/messages/user/Preferences.java
network/src/main/java/io/bitsquare/p2p/network/Connection.java
pom.xml
statistics/src/main/java/io/bitsquare/statistics/Statistics.java
|
2017-03-07 16:40:57 +01:00 |
|
Manfred Karrer
|
a5027d50dc
|
Add language and country combobox to settings tp apply locales
|
2017-03-07 10:03:59 -05:00 |
|
Manfred Karrer
|
7f5441b953
|
Merge remote-tracking branch 'origin/Allow_reopen_dispute' into doa_with_translations
|
2017-03-06 15:08:46 -05:00 |
|
Manfred Karrer
|
96f208f82b
|
Allow re-opening of a dispute (in case the arbitrator has not received it)
|
2017-03-06 14:49:29 -05:00 |
|
Manfred Karrer
|
bbb6d5d244
|
remove string from fxml, refactor naming (WIP)
|
2017-03-05 20:41:04 -05:00 |
|
Manfred Karrer
|
d3380bb450
|
Add translation strings for market and market.offerbook
|
2017-03-05 18:30:08 -05:00 |
|
Manfred Karrer
|
1470fbb444
|
Added all resources for MainView
|
2017-03-04 23:23:30 -05:00 |
|
Manfred Karrer
|
aae59466d4
|
Rename BSResources to Res
|
2017-03-04 19:00:58 -05:00 |
|
Manfred Karrer
|
f626509158
|
Apply resources to BitsquareApp and MainView (WIP)
|
2017-03-04 18:58:27 -05:00 |
|
Manfred Karrer
|
3441286d46
|
Add null check
|
2017-03-04 17:36:36 -05:00 |
|
Manfred Karrer
|
f0bf3daddf
|
Update top altcoin list
|
2017-03-04 17:21:33 -05:00 |
|
Manfred Karrer
|
560cb0af80
|
Show sat/byte at tx print
|
2017-03-04 13:31:52 -05:00 |
|
Manfred Karrer
|
e553a038f5
|
Add DevFlags.DEV_ARBITRATOR to support dev keys. Autofill key if DEV_ARBITRATOR is set
|
2017-03-03 18:37:33 -05:00 |
|
Manfred Karrer
|
63c4bc546f
|
Add TODO
|
2017-03-03 10:57:06 -05:00 |
|
Manfred Karrer
|
28a704ed85
|
Fix bug with backup path when path became invalid. Improve backup handling and UI.
|
2017-03-01 20:46:17 -05:00 |
|
Manfred Karrer
|
bbe7192041
|
Refactor Wallet classes
|
2017-03-01 19:49:23 -05:00 |
|
Manfred Karrer
|
27306cee11
|
Add checkpoint for testnet (again)
|
2017-03-01 18:29:43 -05:00 |
|
Manfred Karrer
|
c6897f730a
|
Update comment
|
2017-03-01 11:33:34 -05:00 |
|
Manfred Karrer
|
f5b503deaf
|
Update bip 44 nr to 142
|
2017-03-01 11:33:05 -05:00 |
|
Manfred Karrer
|
0d863fc163
|
Remove testnet checkpoint
|
2017-03-01 11:26:40 -05:00 |
|
Manfred Karrer
|
68494bd83d
|
Update to checkpoint of block:
000000000000000002884993a2b7306aa7b2af94b6ffe00bc7c689738f7816c6 from: 2017-01-22
|
2017-03-01 11:26:00 -05:00 |
|
Manfred Karrer
|
f27437b008
|
Display BuyerMultiSigPubKey and SellerMultiSigPubKey in Contract.toString. Use Utils.HEX.encode instead of Arrays.toString for pub keys printing.
Remove BuyerMultiSigPubKey and SellerMultiSigPubKey from ContractWindow and TradeDetailsWindow (included in contract.toString now)
|
2017-03-01 10:19:23 -05:00 |
|
Mike Rosseel
|
5b5329ffd4
|
fix string interning problem by removing Utilities.serialize calls and doing signing also with protobuffer
|
2017-03-01 09:20:13 +01:00 |
|
Manfred Karrer
|
ab01e97ddc
|
Move BTC_NODES and USE_TOR_FOR_BTC to BtcOptionKeys
|
2017-02-25 13:23:35 -05:00 |
|