81 commits

Author	SHA1	Message	Date
sstone	f3a5024c0d	set version to 0.2-android-beta6	2018-06-11 16:24:39 +02:00
sstone	684004fef3	set version to 0.2-android-SNAPSHOT	2018-06-11 12:08:37 +02:00
sstone	8c4ecebf2d	set version to 0.2-android-beta5	2018-06-05 17:55:28 +02:00
sstone	f2f32331f6	Merge branch 'json-upickle' into android	2018-05-31 11:13:55 +02:00
sstone	f6c35211d0	provide cleaner json serializer for ShaChain objects	2018-05-31 10:33:52 +02:00
sstone	763191d52b	use upickle for JSON serialization ... json4s does not work on Android	2018-05-31 10:33:52 +02:00
sstone	d9a82f6351	use upickle for JSON serializatoin	2018-05-31 10:33:52 +02:00
sstone	bf26272b86	Set version to 0.2-android-beta4	2018-05-31 10:25:12 +02:00
sstone	a85ba9ceef	set version to 0.2-SNAPSHOT	2018-05-30 19:15:06 +02:00
sstone	e6fe077582	set version to 0.2-beta4	2018-05-30 19:11:44 +02:00
pm47	644b4a2a98	back to SNAPSHOT	2018-05-18 15:53:02 +02:00
pm47	1dd8aa5aab	set version to 0.2-beta3	2018-05-18 15:14:52 +02:00
sstone	5eb381a0f8	set version to 0.2-android-beta3	2018-05-04 17:57:22 +02:00
dpad85	9277308b2b	set version to 0.2-android-beta2	2018-04-11 17:28:36 +02:00
pm47	b5437c9bad	back to SNAPSHOT	2018-04-04 13:52:24 +02:00
pm47	7598615263	set version to 0.2-beta2	2018-04-04 13:40:03 +02:00
pm47	0b1d28f2d9	set version to 0.2-android-beta1	2018-04-04 13:22:51 +02:00
pm47	e946c1a466	Merge branch 'master' into wip-android	2018-03-29 17:09:18 +02:00
pm47	b2178ade30	back to SNAPSHOT	2018-03-28 21:27:55 +02:00
pm47	c39ce692f8	setting version to 0.2-beta1	2018-03-28 20:46:40 +02:00
Fabrice Drouin	2a02461bcc	Upgrade to Bitcoin Core 0.16 (#514) ... * switch to bitcoin core 0.16.0 * check that we are using bitcoin core 0.16 and check that there are no p2pkh UTXOs * update readme [ci skip]	2018-03-26 20:56:51 +02:00
Pierre-Marie Padiou	e44e6b4431	Updated akka/http/json dependencies (#512)	2018-03-26 17:36:33 +02:00
pm47	e5509ed417	merge from master	2018-03-26 12:05:03 +02:00
Pierre-Marie Padiou	d38f227b42	Added copyright notice to all files (#497) ... * added copyright notice to all files * updated date in LICENSE	2018-03-21 16:29:42 +01:00
dpad85	36b0b223b0	Back to snapshot	2018-03-20 16:06:01 +01:00
dpad85	eed7038635	set version to 0.2-android-alpha14	2018-03-20 10:48:51 +01:00
pm47	3a6cd31aa8	Merge branch 'wip-routing-sync' into wip-android	2018-03-19 13:02:24 +01:00
pm47	1754bf0933	back to SNAPSHOT	2018-03-16 17:05:58 +01:00
pm47	99df38db8d	merged from master, set version to 0.2-android-alpha13	2018-03-15 20:56:19 +01:00
pm47	dbb4f5b467	set version to 0.2-alpha11	2018-03-15 19:41:53 +01:00
pm47	c7d225777b	Merge branch 'wip-routing-sync' into wip-android	2018-03-14 13:05:17 +01:00
Pierre-Marie Padiou	1ca7321d53	Created a type for short channel id, and other minor improvements (#480) ... * type-ified `ShortChannelId` * removed unused `listUnspent` method and test * updated sqlite version to 3.21.0.1 * ignore `ReadAck` in `PaymentLifecycle`	2018-03-13 12:09:28 +01:00
pm47	b58a8cbbb9	Merge branch 'master' into wip-android-merge	2018-02-21 18:55:56 +01:00
Dominique	8684fb238b	Removed BitcoinJ watcher (#447) ... Added guava dependency which was previously bundled with bitcoinj.	2018-02-20 14:26:38 +01:00
pm47	1b247ae613	back to SNAPSHOT	2018-02-16 18:10:35 +01:00
pm47	0beca13b23	set version to 0.2-alpha10	2018-02-16 17:28:01 +01:00
pm47	56ef710f06	back to SNAPSHOT	2018-01-23 19:11:06 +01:00
pm47	951bcc4750	set version to 0.2-alpha9	2018-01-23 15:29:21 +01:00
dpad85	42715abda0	Back to SNAPSHOT	2018-01-05 11:54:31 +01:00
pm47	74faad53e8	back to SNAPSHOT	2017-12-23 19:26:54 +01:00
pm47	8edb2a478c	set version to 0.2-alpha8	2017-12-23 18:37:00 +01:00
pm47	6874dd6a50	set version to 0.2-android-alpha12	2017-12-23 00:21:07 +01:00
pm47	44dc219b61	back to SNAPSHOT	2017-12-15 19:33:07 +01:00
pm47	5730f19f06	set version to 0.2-android-alpha11	2017-12-15 19:32:23 +01:00
pm47	8c0eb4c159	back to SNAPSHOT	2017-12-15 19:31:22 +01:00
pm47	83649c3e9f	set version to 0.2-android-alpha10	2017-12-15 19:17:45 +01:00
pm47	62af12b91e	back to SNAPSHOT	2017-12-15 18:28:14 +01:00
pm47	f1afe3f4b7	back to SNAPSHOT	2017-12-14 18:22:39 +01:00
pm47	1155788b5e	set version to 0.2-alpha7	2017-12-14 12:28:25 +01:00
pm47	44f7bd7145	bcak to SNAPSHOT	2017-12-06 19:19:30 +01:00