Manfred Karrer 358f292cbe Merge branch 'Development' into DAO ... # Conflicts: # common/src/main/java/io/bitsquare/app/Version.java # core/src/main/java/io/bitsquare/btc/FeePolicy.java # core/src/main/java/io/bitsquare/btc/WalletAppKitBitSquare.java # core/src/main/java/io/bitsquare/btc/WalletService.java # core/src/main/java/io/bitsquare/btc/wallet/TradeWalletService.java # core/src/main/java/io/bitsquare/locale/CurrencyUtil.java # core/src/main/java/io/bitsquare/trade/BuyerTrade.java # core/src/main/java/io/bitsquare/trade/SellerTrade.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/OffererCreatesAndSignsDepositTxAsBuyer.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTxAsBuyer.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/TakerCreatesDepositTxInputsAsBuyer.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/OffererCreatesAndSignsDepositTxAsSeller.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignAndPublishDepositTxAsSeller.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/TakerCreatesDepositTxInputsAsSeller.java # gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java # gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java # gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java # gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java # gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java # gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java # gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java # network/src/main/resources/PersistedP2PStorageData # package/mac/create_app.sh # pom.xml # provider/src/main/java/io/bitsquare/provider/ProviderMain.java # provider/src/main/java/io/bitsquare/provider/price/PriceRequestService.java		2017-02-12 12:59:29 -05:00
..
rpc_regtest	Add rpc files	2017-02-12 12:14:05 -05:00
bitsquare-sn.cron.sh	Raise maximum memory in seed node cron script	2016-04-27 11:18:28 +02:00
bitsquare-sn.init.sh	Raise maximum connections in seed node init script	2016-04-27 11:17:40 +02:00
bitsquare.conf	change pom files for 0.3.2.2-SNAPSHOT	2015-12-20 20:20:14 +01:00
build.md	Add install instruction for java on linux	2017-02-09 22:09:05 -05:00
CONTRIBUTING.md	Clean up, add missing coins (LTBcoin, SFSC)	2017-02-07 10:05:15 -05:00
install_on_unix.sh	Update install script	2017-02-11 18:18:41 -05:00
install_on_unix_fin.sh	Rename file	2016-08-04 20:56:57 +02:00
modena.css	Support multiline for alerts	2016-02-11 10:35:19 +01:00
monitor-bitsquare-sn.cron.sh	Use simpler netcat command to check server reachability.	2016-06-10 17:33:05 +02:00
seed-node-daemon.md	Update init and cron script references to v0.4.4 (first official beta)	2016-04-27 11:15:44 +02:00
ui-development-notes.md	Add a reference to JavaFX documentation about code behind	2014-09-02 16:12:49 +02:00
update_fork_bitcoinj.sh	update dev scripts	2016-11-19 18:07:44 +01:00