354 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Bill Barman	820587b08d	Merge branch 'develop' into feature/did-tools	2018-11-22 18:38:13 +08:00
Bill Barman	ca59db05f2	doc changes	2018-11-22 18:32:46 +08: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	c26fb87efa	Merge pull request #54 from oceanprotocol/feature/v0.1.22 ... Feature/v0.1.22	2018-11-22 09:25:26 +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
Sebastian Gerske	c5b0c76fbf	move to local version of secret store	2018-11-21 10:44:23 +01:00
Sebastian Gerske	079e3a05f2	update readme	2018-11-20 15:50:02 +01:00
Sebastian Gerske	2cfb32199a	added logging, reworked consumer account on execute agreement	2018-11-20 11:25:10 +01:00
Sebastian Gerske	baeddd98a7	made error logging easier to recap on method send failure	2018-11-20 11:23:39 +01:00
Sebastian Gerske	0afbb8453d	typed lockPayments	2018-11-20 11:23:11 +01:00
Sebastian Gerske	e327e1275b	fixed unit tests on ci	2018-11-20 11:22:39 +01:00
Sebastian Gerske	cc91cdb054	map parameter values	2018-11-20 10:43:11 +01:00
Sebastian Gerske	dfff8fc228	added event wireup ... added lock payment added fulfilmentOperators added declarative way to describe dependencies added service agreement termination	2018-11-20 09:13:03 +01:00
Sebastian Gerske	a2bfe0a816	added connection to brizo	2018-11-19 12:16:11 +01:00
Sebastian Gerske	8a17c2b06c	v0.1.20 v0.1.20	2018-11-16 16:54:48 +01:00
Sebastian Gerske	f6d830e15a	update keeper contracts	2018-11-16 16:53:53 +01:00
Sebastian Gerske	80c6e3d66f	fix tests v0.1.19	2018-11-16 15:22:08 +01:00
Sebastian Gerske	3e29cb015e	v0.1.19	2018-11-16 15:16:22 +01:00
Sebastian Gerske	58cd2810ed	adapt changes to ddo condition structure	2018-11-16 15:15:45 +01:00
Sebastian Gerske	b3ede0a09e	v0.1.18 v0.1.18	2018-11-16 14:27:45 +01:00
Sebastian Gerske	02c36d12ad	fix issue with generating public key, adapt interface changes of aquarius	2018-11-16 14:26:58 +01:00