380 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bill Barman	0f692632b1	fix lint	2018-11-23 09:36:08 +08:00
Bill Barman	423e83d4eb	fix lint	2018-11-23 09:30:44 +08:00
Bill Barman	8f06754880	more docs	2018-11-23 09:19:38 +08:00
Bill Barman	50d6a7e1d9	merge to devolp	2018-11-23 09:06:58 +08:00
Bill Barman	327557949e	move to typescript features	2018-11-23 08:53:39 +08:00
Bill Barman	783f653119	better default parameter parsing	2018-11-22 23:30:07 +08:00
Sebastian Gerske	34b3b23dd7	Merge pull request #55 from oceanprotocol/fix/lockPayment ... Fix/lock payment	2018-11-22 13:35:32 +01:00
Sebastian Gerske	a6c09d0f88	fix lock Payment	2018-11-22 13:14:38 +01:00
Sebastian Gerske	2d41535bab	remove logs	2018-11-22 11:39:20 +01:00
Sebastian Gerske	42959d8fc7	fix compressed deps	2018-11-22 11:38:00 +01:00
Bill Barman	cb7b8d51f1	merge to develop	2018-11-22 18:37:27 +08:00
Bill Barman	cb1cb2229c	remove eslint from package	2018-11-22 18:34:59 +08:00
Sebastian Gerske	8a68715fce	getting closer to compressed deps	2018-11-22 11:32:06 +01:00
Bill Barman	d8cfdfca1e	docs	2018-11-22 18:08:29 +08:00
Bill Barman	cd9659e77a	docs	2018-11-22 18:06:33 +08:00
Sebastian Gerske	8390c12599	fix shifting	2018-11-22 10:58:24 +01:00
Sebastian Gerske	d2f1c7180a	Merge remote-tracking branch 'origin/fix/lockPayment' into fix/lockPayment	2018-11-22 10:56:47 +01:00
Sebastian Gerske	920ae0dc35	added more logging	2018-11-22 10:56:06 +01:00
Sebastian Gerske	cd49f7d56d	Merge branch 'develop' into fix/lockPayment	2018-11-22 09:25:36 +01:00
Sebastian Gerske	c26fb87efa	Merge pull request #54 from oceanprotocol/feature/v0.1.22 ... Feature/v0.1.22	2018-11-22 09:25:26 +01:00
Sebastian Gerske	43fe8634d2	fix lockPayment	2018-11-22 09:22:27 +01:00
Bill Barman	a979f6c748	refresh package-lock	2018-11-22 13:42:11 +08:00
Bill Barman	a3e8eeb45c	rebuild with packages	2018-11-22 13:32:47 +08:00
Bill Barman	2418382dfe	merge with develop	2018-11-22 08:51:32 +08:00
Sebastian Gerske	38d7d2c8eb	v0.1.22	2018-11-21 17:34:39 +01:00
Sebastian Gerske	bd39ff9cdb	keeper-contracts 0.3.23	2018-11-21 17:34:00 +01:00
Sebastian Gerske	484ec08d61	Merge pull request #45 from oceanprotocol/feature/sa_register ... Feature/sa register	2018-11-21 17:18:56 +01:00
Sebastian Gerske	f2244cf603	v0.1.21	2018-11-21 17:00:36 +01:00
Sebastian Gerske	e4bd6ea84f	refactor api path	2018-11-21 16:47:24 +01:00
Sebastian Gerske	18f0dd7040	shortened find()	2018-11-21 16:38:48 +01:00
Sebastian Gerske	17e6540031	Merge pull request #53 from oceanprotocol/feature/generate-fulfillment-indices ... Generate fulfillmentIndices from service agreement conditions, set fu…	2018-11-21 16:32:19 +01:00
ssallam	1a3bb2f8b1	Generate fulfillmentIndices from service agreement conditions, set fulfillmentOperator to 1 (or operator), fix typo.	2018-11-21 15:58:59 +01:00
Sebastian Gerske	5ae7f5644f	Merge remote-tracking branch 'origin/style/sa_register' into feature/sa_register ... # Conflicts: # src/ocean/Ocean.ts	2018-11-21 15:56:39 +01:00
diminator	f14ca2b0a5	pass tslint	2018-11-21 15:26:46 +01:00
Sebastian Gerske	efeb0fa11f	fixed lint	2018-11-21 15:10:09 +01:00
Sebastian Gerske	b8242edba0	Merge branch 'feature/sa_register' of github.com:oceanprotocol/squid-js into feature/sa_register	2018-11-21 15:09:13 +01:00
Sebastian Gerske	779b5794d8	Merge pull request #52 from oceanprotocol/style/sa_register ... some style changes for readability	2018-11-21 15:08:41 +01:00
diminator	eef46c7a1c	some style changes for readability	2018-11-21 14:59:22 +01:00
Sebastian Gerske	4d513d39e0	add logging	2018-11-21 12:31:08 +01:00
Sebastian Gerske	c5b0c76fbf	move to local version of secret store	2018-11-21 10:44:23 +01:00
Sebastian Gerske	3c7484f179	pin ganache version to fix build	2018-11-21 08:12:49 +01:00
Bill Barman	c3d3e1a301	add embedded public keys	2018-11-21 11:24:53 +08:00
Bill Barman	057554cfaa	add better publickey store type handling	2018-11-21 10:04:33 +08:00
Bill Barman	d67ed4bc15	change PublicKey labels	2018-11-21 08:55:02 +08:00
Bill Barman	610bab81af	change to the correct context url	2018-11-21 08:40:46 +08:00
Bill Barman	bdaea12c92	cleanup tests	2018-11-21 08:35:41 +08:00
Bill Barman	9eed1fe6d1	correct rsa to use binary source data	2018-11-21 08:29:05 +08:00
Sebastian Gerske	079e3a05f2	update readme	2018-11-20 15:50:02 +01:00
Bill	d8b60bafd6	change package ursa to ursa-optional	2018-11-20 20:21:38 +08:00
Bill Barman	e869dbf9e0	fix test for validate proof by another lib	2018-11-20 19:28:02 +08:00