1
0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00

2221 Commits

Author SHA1 Message Date
Ahmed Ali
a57d6610e2 add test 2020-07-03 14:03:49 +02:00
Ahmed Ali
2756f5a019 remove auto-generated test files 2020-07-03 12:50:17 +02:00
Ahmed Ali
d8dadf5495 add ownerAssets 2020-07-03 12:49:05 +02:00
Ahmed Ali
58419793bf
Merge pull request #125 from oceanprotocol/dependabot/npm_and_yarn/yargs-15.4.0
Bump yargs from 15.3.1 to 15.4.0
2020-07-03 11:32:38 +02:00
Ahmed Ali
28d1775593 remove test output files 2020-07-03 11:31:47 +02:00
Ahmed Ali
cd9f6295ed cleaning 2020-07-03 11:29:41 +02:00
Ahmed Ali
08c3da3edd
Merge pull request #124 from oceanprotocol/dependabot/npm_and_yarn/truffle/hdwallet-provider-1.0.37
Bump @truffle/hdwallet-provider from 1.0.36 to 1.0.37
2020-07-03 09:32:46 +02:00
dependabot[bot]
4452b89b55
Bump yargs from 15.3.1 to 15.4.0
Bumps [yargs](https://github.com/yargs/yargs) from 15.3.1 to 15.4.0.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v15.3.1...v15.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-03 01:07:37 +00:00
dependabot[bot]
c496bab3ba
Bump @truffle/hdwallet-provider from 1.0.36 to 1.0.37
Bumps [@truffle/hdwallet-provider](https://github.com/trufflesuite/truffle) from 1.0.36 to 1.0.37.
- [Release notes](https://github.com/trufflesuite/truffle/releases)
- [Commits](https://github.com/trufflesuite/truffle/compare/@truffle/hdwallet-provider@1.0.36...@truffle/hdwallet-provider@1.0.37)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-03 01:07:20 +00:00
Ahmed Ali
ca8ec53431
Merge pull request #110 from oceanprotocol/feature/marketplace-flow
Feature/marketplace flow
2020-07-02 17:24:48 +02:00
Ahmed Ali
8cfffd5976
Merge pull request #119 from oceanprotocol/feature/assets-download
Feature/assets download
2020-07-02 17:23:38 +02:00
Ahmed Ali
5ee4b1e8ee
Merge pull request #116 from oceanprotocol/fix/unit-test
Fix/unit test
2020-07-02 17:10:06 +02:00
Ahmed Ali
96e1bb1b84 fix unit test conflict 2020-07-02 17:02:30 +02:00
Ahmed Ali
34c1822128 fix download function 2020-07-02 16:40:40 +02:00
Ahmed Ali
32f8781c70 fix failed assertions 2020-07-02 09:55:40 +02:00
Alex Coseru
44fbdbc892
Merge pull request #123 from oceanprotocol/alexcos20-patch-1
Update .travis.yml
2020-07-02 08:36:58 +03:00
Alex Coseru
30c283d129
Update .travis.yml 2020-07-02 08:26:24 +03:00
Ahmed Ali
ea6713dfea
Merge pull request #122 from oceanprotocol/dependabot/npm_and_yarn/typescript-3.9.6
Bump typescript from 3.9.5 to 3.9.6
2020-07-02 07:13:13 +02:00
dependabot[bot]
6d59fea7d6
Bump typescript from 3.9.5 to 3.9.6
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 3.9.5 to 3.9.6.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-02 01:09:42 +00:00
alexcos20
b15dc39363 fix dtCost -> cost 2020-07-01 12:43:45 -07:00
alexcos20
ea75d348ea fix some bugs 2020-06-30 16:28:59 -07:00
Ahmed Ali
eb1966b769 fix initialize 2020-06-30 19:54:23 +02:00
Ahmed Ali
f9c5b7bd49 fix initialize 2020-06-30 11:37:03 +02:00
Ahmed Ali
2219d183f6 order asset 2020-06-30 09:58:24 +02:00
Ahmed Ali
acd4edca38
Merge pull request #120 from oceanprotocol/dependabot/npm_and_yarn/typedoc-0.17.8
Bump typedoc from 0.17.7 to 0.17.8
2020-06-30 06:38:07 +02:00
dependabot[bot]
b60ec6a3d6
Bump typedoc from 0.17.7 to 0.17.8
Bumps [typedoc](https://github.com/TypeStrong/TypeDoc) from 0.17.7 to 0.17.8.
- [Release notes](https://github.com/TypeStrong/TypeDoc/releases)
- [Commits](https://github.com/TypeStrong/TypeDoc/compare/v0.17.7...0.17.8)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-30 01:05:27 +00:00
Ahmed Ali
2d2e41c7f3 download 2020-06-29 21:32:33 +02:00
Ahmed Ali
cad81b65f5
Merge pull request #117 from oceanprotocol/feature/asset-resolve
feature/resolve-assets
2020-06-29 21:25:28 +02:00
Ahmed Ali
37d423b8d3 cleaning 2020-06-29 21:17:29 +02:00
Ahmed Ali
d5b6bb3221 add getService 2020-06-29 21:08:46 +02:00
Ahmed Ali
2f5025a659 minor fix 2020-06-29 19:21:14 +02:00
Ahmed Ali
5535305c5f publishing services prior creating asset 2020-06-29 19:20:29 +02:00
Ahmed Ali
06933aa2fa add resolve test 2020-06-29 18:48:14 +02:00
Ahmed Ali
5f95c67e3e fix lint 2020-06-29 18:20:56 +02:00
Ahmed Ali
5ac2a05172 Merge branch 'feature/marketplace-flow' of https://github.com/oceanprotocol/ocean-lib-js into feature/marketplace-flow 2020-06-29 18:19:20 +02:00
Ahmed Ali
6adac7b6f5 fix allowance in datatoken 2020-06-29 18:18:57 +02:00
arsenyjin
db693c7331 move datatokens tests 2020-06-29 12:58:52 +02:00
arsenyjin
67453da19d fix transferFrom 2020-06-29 12:30:37 +02:00
arsenyjin
3f933280d9 fix transferFrom 2020-06-29 12:20:37 +02:00
arsenyjin
94377bd3ab add bob gets datatokens 2020-06-29 12:05:17 +02:00
Ahmed Ali
2025527f97 remove some stuff 2020-06-29 09:46:25 +02:00
Alex Coseru
11bced5fca
Merge pull request #115 from oceanprotocol/feature/barge_with_ganache
barge contains ganache now
2020-06-28 15:45:01 +03:00
Alex Coseru
987f2586a2
Update .travis.yml 2020-06-28 15:23:29 +03:00
Alex Coseru
8ab490ccd2
barge contains ganache now 2020-06-28 15:17:49 +03:00
Ahmed Ali
1addf160eb
Merge pull request #113 from oceanprotocol/feature/integrate-barge
Feature/integrate barge
2020-06-26 21:42:57 +02:00
Ahmed Ali
18302f4ec5 fix start ocean 2020-06-26 21:34:44 +02:00
Ahmed Ali
5e60625832 add more timeout 2020-06-26 21:32:53 +02:00
Ahmed Ali
d9e80f5cff add sleep for timeout to start barge 2020-06-26 21:25:19 +02:00
Ahmed Ali
696856eb0d fix ddo 2020-06-26 20:56:27 +02:00
Ahmed Ali
cf2072ecab minor config fix 2020-06-26 20:32:08 +02:00