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 |
|
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 |
|
Manfred Karrer
|
fd5e41fb7e
|
Cleanup, remove ATM
|
2017-03-12 10:09:00 -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
|
c7c7b490ba
|
Apply display strings for windows
|
2017-03-11 22:35:31 -05:00 |
|
Manfred Karrer
|
2cf0e094dd
|
Apply display strings for windows (WIP)
|
2017-03-11 20:10:29 -05:00 |
|
Manfred Karrer
|
9d8b3ed6eb
|
Apply display strings for dao
|
2017-03-11 18:23:53 -05:00 |
|
Manfred Karrer
|
1cfda23100
|
Apply display strings for account/pw, seed, backup, altcoin, fiat
|
2017-03-11 12:23:25 -05:00 |
|
Manfred Karrer
|
2fcb5ab1f9
|
Fixed incorrect update of button handler and balance binding at list items (scrolling screwed it up)
|
2017-03-10 21:23:58 -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 |
|
Manfred Karrer
|
382607a965
|
Dont log error if we have stopped already
|
2017-03-10 20:20:00 -05:00 |
|
Manfred Karrer
|
82f9b73468
|
Add null check, return if msg is null
|
2017-03-10 19:44:13 -05:00 |
|
Manfred Karrer
|
8debc1a0f3
|
Add note for Intellij 14
|
2017-03-10 19:43:20 -05:00 |
|
Manfred Karrer
|
cfb079609d
|
Make offererContractSignature nullable
|
2017-03-10 19:43:06 -05:00 |
|
Manfred Karrer
|
835373878e
|
Add requirements for protobuffer to build.md
|
2017-03-10 19:42:09 -05:00 |
|
Manfred Karrer
|
4056444e51
|
Apply display strings for account/arbitrator (WIP)
|
2017-03-10 12:16:11 -05:00 |
|
Manfred Karrer
|
273f8bdc5c
|
Merge pull request #772 from bitsquare/protobuffer
Java Serialization -> Protobuffer
|
2017-03-10 11:04:15 -05:00 |
|
Mike Rosseel
|
888a6da827
|
revert log to DAO version
|
2017-03-10 16:48:27 +01:00 |
|
Mike Rosseel
|
9fdd636f7d
|
fix disputeResult protobuffer handling
|
2017-03-10 16:28:25 +01:00 |
|
Mike Rosseel
|
2fab74db0c
|
fix arbitrator flow, mainly @Nullable fields, non-filled in fields for the protobuf message, missing uid, missing attachment setting on deserialize.
|
2017-03-10 13:47:32 +01:00 |
|
Mike Rosseel
|
daef9e4527
|
refactor to new way of testing nullable
|
2017-03-09 08:09:24 +01:00 |
|
Manfred Karrer
|
068abd41b2
|
Apply display strings for settings
|
2017-03-08 22:18:41 -05:00 |
|