587 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sebastian Gerske	4e30056483	removed config of mocked service	2018-11-27 13:57:54 +01:00
Sebastian Gerske	07f347cefc	removed test page	2018-11-27 13:55:05 +01:00
Sebastian Gerske	8d2b9c62f2	fix fire lazers	2018-11-27 13:38:18 +01:00
Sebastian Gerske	0981289745	changed formatting	2018-11-27 12:27:15 +01:00
Sebastian Gerske	2a24529413	up, up it goes	2018-11-27 09:07:36 +01:00
Sebastian Gerske	79281c4f98	Merge remote-tracking branch 'origin/develop' into feature/trilobite_countdown ... # Conflicts: # package.json	2018-11-27 09:02:08 +01: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	43a5e53d57	fix brizo connection	2018-11-26 15:24:59 +01:00
Sebastian Gerske	ccf6bb4227	removed warning	2018-11-26 12:14:13 +01:00
Sebastian Gerske	1b3ec0f145	fix build	2018-11-26 11:45:58 +01:00
Sebastian Gerske	12bd56e5f9	adapt unit tests	2018-11-26 11:04:05 +01:00
Sebastian Gerske	2201ebb997	fix samples	2018-11-23 17:05:44 +01:00
Sebastian Gerske	3bf09e63a1	added executeAgreement event listener	2018-11-23 16:09:31 +01:00
Sebastian Gerske	a904649c33	add event listener for lockPayment	2018-11-23 16:01:42 +01:00
Sebastian Gerske	07455e84a9	Merge branch 'develop' into feature/trilobite_countdown	2018-11-23 15:53:34 +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
Sebastian Gerske	695825c50b	fix unsubscribe	2018-11-23 14:54:22 +01:00
Sebastian Gerske	17f1b3e53e	fix listen once	2018-11-23 14:28:41 +01:00
Sebastian Gerske	0c3c21b4c5	fix listener, add eventing, moved generation of conditions to template structure	2018-11-23 14:14:35 +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	9503419b0e	added more functionality to event listener	2018-11-23 12:40:49 +01:00
Sebastian Gerske	1b967896df	small ddo adoptions	2018-11-23 12:40:18 +01:00
Sebastian Gerske	f37a1cc1c6	make event listener static	2018-11-23 11:47:39 +01:00
Sebastian Gerske	df475b6958	added event listener	2018-11-23 11:39:16 +01:00
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