370 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bill Barman	10575af718	docs and cleanup	2018-11-23 10:03:51 +08:00
Bill Barman	f51e631536	docs and cleanup	2018-11-23 10:02:54 +08:00
Bill Barman	6776088be3	add docs and fix lint	2018-11-23 09:54:37 +08:00
Bill Barman	fa5c8ac260	Merge branch 'feature/did-tools' into feature/did-resolver	2018-11-23 09:41:03 +08:00
Bill Barman	80ac594f35	merge to develop	2018-11-23 09:40:32 +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
Bill Barman	c808b1dd4a	add circular checks in resolver	2018-11-22 19:21:13 +08:00
Bill Barman	757e6884c3	better resolver logic	2018-11-22 19:01:36 +08:00
Bill Barman	41613e5131	better handling of default values	2018-11-22 18:54:56 +08:00
Bill Barman	fc119f8413	Merge branch 'feature/did-tools' into feature/did-resolver	2018-11-22 18:40:35 +08:00
Sebastian Gerske	2d41535bab	remove logs	2018-11-22 11:39:20 +01:00
Bill Barman	820587b08d	Merge branch 'develop' into feature/did-tools	2018-11-22 18:38:13 +08:00
Sebastian Gerske	42959d8fc7	fix compressed deps	2018-11-22 11:38:00 +01:00
Bill Barman	ca59db05f2	doc changes	2018-11-22 18:32:46 +08:00
Sebastian Gerske	8a68715fce	getting closer to compressed deps	2018-11-22 11:32:06 +01: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
Bill Barman	273cb7694a	cleanup	2018-11-22 17:14:36 +08:00
Bill Barman	ec955060a2	add in chain resolving	2018-11-22 17:10:20 +08:00
Bill Barman	21fac92a88	bring upto DIDTools changes	2018-11-22 16:45:22 +08:00
Bill Barman	f15f318a7a	Merge branch 'feature/did-tools' into feature/did-resolver	2018-11-22 16:40:46 +08:00
Bill Barman	d79ad1e7b1	rename DIDTo .. didTo	2018-11-22 16:40:19 +08:00
Bill Barman	460ac496fe	move DID to utils/DIDTools	2018-11-22 16:39:05 +08:00
Bill Barman	cca7b269f0	move to utils folder and cleanup	2018-11-22 16:35:37 +08: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	c15d814d2f	init start on resolver	2018-11-22 14:53:01 +08:00
Bill Barman	fc19bf6d4c	refresh package-lock again	2018-11-22 13:52:42 +08:00
Bill Barman	79d5cf283a	refresh package-lock	2018-11-22 13:47:12 +08:00
Bill Barman	8e022ae6a4	rebuild with packages and lint	2018-11-22 13:34:39 +08:00
Bill Barman	ef8a8ec0f7	add docs and rest of DID conversion tools	2018-11-22 13:29:40 +08:00
Bill Barman	5fcc183a09	init DID tools	2018-11-22 11:53:27 +08:00
Sebastian Gerske	38d7d2c8eb	v0.1.22 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 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