Manfred Karrer
|
74d265d197
|
Do check for correct crypt setup before any services are initialized
|
2017-03-13 16:34:48 -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
|
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
|
4056444e51
|
Apply display strings for account/arbitrator (WIP)
|
2017-03-10 12:16:11 -05:00 |
|
Manfred Karrer
|
068abd41b2
|
Apply display strings for settings
|
2017-03-08 22:18:41 -05:00 |
|
Manfred Karrer
|
f61234eded
|
Apply display strings for support
|
2017-03-08 21:04:46 -05:00 |
|
Manfred Karrer
|
13f1543ce7
|
Apply display strings for funds
|
2017-03-08 20:21:50 -05:00 |
|
Manfred Karrer
|
0abac13bbe
|
Apply displaystring for portfolio/history and portfolio/failed
|
2017-03-08 18:44:30 -05:00 |
|
Manfred Karrer
|
7692691fe8
|
Apply displaystring for portfolio/pending
|
2017-03-08 18:32:18 -05:00 |
|
Manfred Karrer
|
c6b5cbda02
|
Apply displaystring for create offer and take offer views
|
2017-03-07 23:12:24 -05:00 |
|
Manfred Karrer
|
019a58baee
|
Apply code inspection
|
2017-03-07 22:04:08 -05:00 |
|
Manfred Karrer
|
e545579cf1
|
Add display string for create offer. remove unused strings
|
2017-03-07 21:59:12 -05:00 |
|
Manfred Karrer
|
2fd47852a4
|
add popup for language change
|
2017-03-07 20:20:42 -05:00 |
|
Manfred Karrer
|
5121e759d1
|
apply code inspection
|
2017-03-07 20:20:26 -05:00 |
|
Mike Rosseel
|
22d5e7ad05
|
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:41:23 +01: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
|
bfa06b57e2
|
Add string for offerView
|
2017-03-06 22:53:48 -05:00 |
|
Manfred Karrer
|
931d34ea82
|
Merge branch 'Development' into doa_with_translations
# Conflicts:
# gui/src/main/java/io/bitsquare/gui/main/market/MarketView.fxml
# gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java
# gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.java
# gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java
|
2017-03-06 21:25:10 -05:00 |
|
Manfred Karrer
|
9567393bb6
|
Remove text string in fxml files
|
2017-03-06 21:17:10 -05:00 |
|
Manfred Karrer
|
e9fd330447
|
Merge pull request #768 from undso/scrollpanes
Scrollpanes in market section
|
2017-03-06 20:48:07 -05:00 |
|
Alexander Friedrichs
|
aa7615cd99
|
Removed unused code lines
|
2017-03-06 23:51:39 +01:00 |
|
Alexander Friedrichs
|
c35ce6bb79
|
Scrollpanes in market section
|
2017-03-06 23:37:53 +01: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
|
5bc1ee2257
|
Merge branch 'Allow_reopen_dispute' into Development
|
2017-03-06 15:06:15 -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
|
0982346636
|
Add translation strings for TradesChartsView
|
2017-03-05 19:33:36 -05:00 |
|
Manfred Karrer
|
9edf504018
|
Add translation strings for SpreadView
|
2017-03-05 18:47:13 -05:00 |
|
Manfred Karrer
|
d3380bb450
|
Add translation strings for market and market.offerbook
|
2017-03-05 18:30:08 -05:00 |
|
Manfred Karrer
|
1e55c1249e
|
Merge branch 'DAO' into doa_with_translations
|
2017-03-05 17:51:31 -05:00 |
|
Manfred Karrer
|
20f53f3ee6
|
Merged Scroll pane PR (https://github.com/bitsquare/bitsquare/pull/766, https://github.com/bitsquare/bitsquare/pull/765)
|
2017-03-05 17:47:07 -05:00 |
|