401 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ssallam	390ab71274	Merge branch 'develop' into feature/trilobite_countdown	2018-12-04 21:28:13 +01:00
Matthias Kretschmann	34270c509b	Merge pull request #62 from oceanprotocol/create-contributing-md ... Standardize contrib guidelines across public repos	2018-11-30 16:41:26 +01:00
Troy McConaghy	3c0217a9d7	Standardize contrib guidelines across public repos ... We're standardizing the Ocean Protocol contribution guidelines across all public repos by linking to one standard central page in the docs. It's easier to update one page than 30+ pages. (We currently have 36 public repos.)	2018-11-30 15:34:50 +01:00
Sebastian Gerske	6d1d14dfc4	v0.2.0	2018-11-29 16:45:41 +01:00
Sebastian Gerske	e433437926	keeper-contracts 0.5.0	2018-11-29 16:39:48 +01:00
Sebastian Gerske	b82bfd47e4	add hdwallet package	2018-11-29 09:16:01 +01:00
Sebastian Gerske	9ebe43510f	added logging of brizo args	2018-11-29 08:45:10 +01:00
Sebastian Gerske	f65bb4e050	added support for poa mainnet (core) and testnet (sokol)	2018-11-29 08:44:58 +01:00
Sebastian Gerske	9cd134052c	example for adding hdwallet	2018-11-28 13:54:37 +01:00
Sebastian Gerske	ee45cf96c9	v0.1.28	2018-11-28 12:13:44 +01:00
Sebastian Gerske	2b4d45349f	use compiled typescript instead of ts-loader to generate minified versions	2018-11-28 12:12:58 +01:00
Sebastian Gerske	0a01d0e0e7	v0.1.27	2018-11-27 14:14:32 +01:00
Sebastian Gerske	7829b96420	fix bump version merge	2018-11-27 14:13:51 +01:00
Sebastian Gerske	32c7cc1f1a	remove old password from config	2018-11-27 13:58:06 +01:00
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