390 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bill	22215dc154	merge to develop	2018-11-27 13:15:42 +08:00
Dimitri De Jonghe	6c28da96e4	Merge pull request #60 from oceanprotocol/fix/windows.squidy ... Webpack window.squid build v0.1.26	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 v0.1.25	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 Barman	8175547048	fix enum assign to value instead of string	2018-11-23 10:42:30 +08:00
Bill Barman	38b7585478	import ValueType for DIDRecord	2018-11-23 10:19:16 +08:00
Bill Barman	bd05194f31	move test to utils folder	2018-11-23 10:14:00 +08:00
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	b6b7cd33ca	v0.1.24 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
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
Sebastian Gerske	9cee6c6536	v0.1.23 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
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	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	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