Commit graph

2729 commits

Author SHA1 Message Date
Mike Rosseel
50a185bcd8 offerdata fixes 2016-09-13 22:37:25 +02:00
Mike Rosseel
e7ca8243f6 Merge remote-tracking branch 'origin/Development' into issue544-api
Conflicts:
	core/src/main/java/io/bitsquare/trade/statistics/TradeStatisticsManager.java
2016-09-13 18:51:48 +02:00
Mike Rosseel
0067f39545 add offer api calls (rough outlines) 2016-09-13 18:48:29 +02:00
Mike Rosseel
2449da44a5 added most of the api calls as dummy calls, work on wallet api 2016-09-12 21:52:18 +02:00
Manfred Karrer
69486cfa4d Remove ms wallet wip code 2016-09-08 12:22:00 -05:00
Manfred Karrer
e426a0ad4c Merge branch 'MultiSigWallet' into Development 2016-09-08 12:20:15 -05:00
Manfred Karrer
2d31aac9ad Use clear and addAll instead of setAll to avoid UnsupportedOperationException. Add try catch. 2016-09-08 09:31:14 -05:00
Manfred Karrer
6d28dd5c4a Add nr of trades to volume chart tooltip 2016-09-07 22:01:34 -05:00
Mike Rosseel
f259ffec96 name change from contract_data to payment_method_details 2016-09-07 07:52:24 +02:00
Mike Rosseel
c8aeeabd66 account_list now managed through our own classes to decouple from bitsquare 2016-09-06 21:31:03 +02:00
Manfred Karrer
81668a82cc Fix issue with withdrawal if tx size exceeds 100kb limit. Show fee as sat/byte 2016-09-05 13:46:48 -05:00
Manfred Karrer
5e5367fc57 Add Multisig wallet view 2016-09-04 20:47:07 -05:00
Manfred Karrer
dab1b56e75 Update code settings file 2016-09-04 14:57:03 -05:00
Manfred Karrer
e747392323 v0.4.9.6 2016-09-04 14:48:38 -05:00
Manfred Karrer
6a4e1d467b Merge branch 'Development' 2016-09-04 14:46:31 -05:00
Manfred Karrer
a0f078735f Add delay at result handler of mailbox msg propagation. Add logs 2016-09-04 14:32:00 -05:00
Mike Rosseel
ef5b71aad0 enabling api with gui 2016-09-04 20:38:32 +02:00
Manfred Karrer
84a55d9c90 Change check to prec. 3 for making decision to display precision 8 or 4 2016-09-04 13:18:15 -05:00
Manfred Karrer
75b269c791 Update PersistedP2PStorageData 2016-09-04 13:02:08 -05:00
Manfred Karrer
a497c73bac Added new payment method: Faster payments 2016-09-04 12:52:36 -05:00
Manfred Karrer
fd1efe7353 Fix issue with message Listenter added too late and wrong handling of PreliminaryDataRequest vs. UpdateDataRequest 2016-09-04 11:57:04 -05:00
Manfred Karrer
48e6cc34a8 Set currencyResult at filter to true if showAll is selected 2016-09-04 08:46:39 -05:00
Mike Rosseel
da5a733d67 reorg, testing user payment accounts 2016-09-04 15:07:59 +02:00
Manfred Karrer
3f79a97cc0 Allow repeated dispute close 2016-09-03 23:21:13 -05:00
Manfred Karrer
c7736beb96 Use setAll instead of clear + addAll 2016-09-03 22:47:59 -05:00
Manfred Karrer
a9a6ee8dfb Add null check 2016-09-03 22:47:31 -05:00
Manfred Karrer
afdc05cff8 Change warning popup if create offer pressed with no account for selected currency 2016-09-03 21:44:44 -05:00
Manfred Karrer
80b69109b9 Add support for other currency than countries default currency at cash deposit and add support for EUR for PerfectMoney 2016-09-03 20:17:25 -05:00
Manfred Karrer
56aaf3b37b Add support for other currency than countries default currency at bank accounts 2016-09-03 20:00:23 -05:00
Manfred Karrer
20fd318636 Add "extra requirements" field to cash deposit 2016-09-03 15:12:09 -05:00
Manfred Karrer
28b440ef90 Added new altcoins: Opal, Synereo 2016-09-03 14:10:48 -05:00
Manfred Karrer
0fd74178a8 Add nr of disputes to details window and to table. Add onion addresses to table. 2016-09-03 13:26:35 -05:00
Manfred Karrer
9616cc0524 Add 2 more dispute result reasons 2016-09-03 11:41:29 -05:00
Manfred Karrer
2c18fb82eb Revert to detailed version of button label 2016-09-03 11:24:49 -05:00
Manfred Karrer
d33eba9148 Revert to detailed version of button label 2016-09-03 11:22:27 -05:00
Manfred Karrer
577df65df7 Add 2 more dispute result reasons 2016-09-03 10:44:27 -05:00
Manfred Karrer
83d411eba5 Prepare v0.4.9.6 2016-09-03 10:34:48 -05:00
Manfred Karrer
f3ebed39ea Add fix for invalid offer IDs (caused by adding the version nr to the offer ID in the dev branch, whcih got reverted later again) 2016-09-03 10:32:39 -05:00
Manfred Karrer
d270a736fa Improve logging 2016-09-03 10:25:35 -05:00
Manfred Karrer
86297331e8 Change INTERVAL_SEC from 40 to 30 sec (before 0.4.9.5 it was 20 sec) 2016-09-03 10:19:36 -05:00
Manfred Karrer
29ca2f0454 Revert decrease of peers to send broadcast msg (we got some issues with less reliable msg delivery which might be caused by that prev. change) to 7 peers again. 2016-09-03 10:14:51 -05:00
Mike Rosseel
f249d00748 wallet_details works + refactoring so that all bitsquare deps are in the proxy 2016-09-02 17:02:13 +02:00
Mike Rosseel
e28f1ee919 currency_list: sort on name 2016-09-01 08:17:57 +02:00
Mike Rosseel
9aac8bc989 guice is wired so statistics etc can be obtained from bitsquare. Added classpath loading of the yml file, added lombok 2016-08-31 22:31:28 +02:00
Manfred Karrer
d6d1d63393 Add copy icon to fields 2016-08-29 21:48:09 +02:00
Manfred Karrer
04bcfead57 v 0.4.9.5 2016-08-29 16:48:15 +02:00
Manfred Karrer
0931ed9d2e Delay charts building for trades 2016-08-29 16:35:03 +02:00
Manfred Karrer
8169b0f768 Fix wrong column values 2016-08-29 16:30:52 +02:00
Manfred Karrer
a5f83c436a Improve wording 2016-08-29 14:52:31 +02:00
Manfred Karrer
983247cadc Improve wording 2016-08-29 14:27:53 +02:00