709 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sebastian Gerske	dccd58802a	added error messages	2018-11-23 11:39:08 +01:00
Sebastian Gerske	375f153b93	add detection for local poa	2018-11-23 09:57:37 +01:00
Sebastian Gerske	43db4412ee	add events to template	2018-11-23 09:57:26 +01:00
Sebastian Gerske	8d018633a9	added buy asset and grant access samples, prepare for consumption	2018-11-23 09:17:30 +01:00
Sebastian Gerske	47f245bbed	Merge pull request #56 from oceanprotocol/feature/v0.1.23 ... Feature/v0.1.24	2018-11-23 09:12:14 +01:00
Sebastian Gerske	b6b7cd33ca	v0.1.24	2018-11-22 13:39:32 +01:00
Sebastian Gerske	42396713ff	fix merge	2018-11-22 13:38:45 +01:00
Sebastian Gerske	63c844b87f	Merge remote-tracking branch 'origin/develop' into feature/v0.1.23 ... # Conflicts: # package-lock.json # test/ocean/ServiceAgreement.test.ts	2018-11-22 13:37:10 +01: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
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
Sebastian Gerske	9cee6c6536	v0.1.23	2018-11-22 09:43:47 +01:00
Sebastian Gerske	aab0882c3b	update packages ... keeper 0.3.25	2018-11-22 09:43:06 +01:00
Sebastian Gerske	450ecb12a7	ignore test for now	2018-11-22 09:42:06 +01:00
Sebastian Gerske	f71f79c8a7	Merge remote-tracking branch 'origin/develop' into feature/v0.1.23	2018-11-22 09:29:14 +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
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
diminator	b07058b062	added build strategies ... removed namespace import	2018-11-21 16:46:03 +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	2018-11-16 16:54:48 +01:00
Sebastian Gerske	f6d830e15a	update keeper contracts	2018-11-16 16:53:53 +01:00