399 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bill	a3f6a8916b	merge to develop	2018-11-27 13:12:23 +08:00
Dimitri De Jonghe	6c28da96e4	Merge pull request #60 from oceanprotocol/fix/windows.squidy ... Webpack window.squid build	2018-11-26 16:07:51 +01:00
Jernej Pregelj	efb43047f1	version bump	2018-11-26 16:00:14 +01:00
Jernej Pregelj	7f3b4b1f48	webpack package builder	2018-11-26 15:55:09 +01:00
Sebastian Gerske	10ed80ce8e	Merge pull request #59 from oceanprotocol/deploy/es-cjs-umd-min-builds ... Deploy/es cjs umd min builds	2018-11-23 15:53:23 +01:00
diminator	449afb3958	bumpversion	2018-11-23 13:17:16 +01:00
diminator	faf974d03b	Merge remote-tracking branch 'remotes/origin/develop' into deploy/es-cjs-umd-min-builds	2018-11-23 12:57:07 +01:00
diminator	5f283ff1c7	module, browser, files (umd/unpkg)	2018-11-23 12:55:37 +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
Bill	314c613e11	rename readFromData to "fromData" as the equal opposite too "toData"	2018-11-23 12:17:09 +08:00
Bill	6ba9046d64	add ability to add a public key and autorisation, break out the interfaces to seperate modules	2018-11-23 12:09:56 +08:00
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	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
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	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
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
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