375 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
billbsing	3ae7132a74	Merge branch 'develop' into feature/did-tools	2018-12-05 13:54:58 +08: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
Bill	655d865e28	merge to develop	2018-11-27 13:13:49 +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	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
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
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 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	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
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	fc19bf6d4c	refresh package-lock again	2018-11-22 13:52:42 +08:00
Bill Barman	79d5cf283a	refresh package-lock	2018-11-22 13:47:12 +08:00
Bill Barman	8e022ae6a4	rebuild with packages and lint	2018-11-22 13:34:39 +08:00
Bill Barman	ef8a8ec0f7	add docs and rest of DID conversion tools	2018-11-22 13:29:40 +08:00
Bill Barman	5fcc183a09	init DID tools	2018-11-22 11:53:27 +08:00
Sebastian Gerske	38d7d2c8eb	v0.1.22 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 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