oceanprotocol/ocean.js
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00
Code Releases Activity
244 Commits 29 Branches 241 Tags
Commit Graph

244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ahmed Ali
574cd4f57b fix provider URi 2020-06-26 19:47:13 +02:00
Ahmed Ali
a786c83373 integrate barge 2020-06-26 19:38:52 +02:00
Ahmed Ali
a770b45c95 cleaning 2020-06-26 19:32:01 +02:00
Ahmed Ali
5923e28530 fix asset.create 2020-06-26 15:40:26 +02:00
Ahmed Ali
69fb8be4db Merge branch 'feature/marketplace-flow' of https://github.com/oceanprotocol/ocean-lib-js into feature/marketplace-flow 2020-06-26 13:09:52 +02:00
Ahmed Ali
5433d1e07f fix singature 2020-06-26 11:31:56 +02:00
Ahmed Ali
f9065fd4d6
Merge branch 'develop' into feature/marketplace-flow 2020-06-26 10:20:18 +02:00
Ahmed Ali
fde6cbe305
Merge pull request #111 from oceanprotocol/dependabot/npm_and_yarn/truffle/hdwallet-provider-1.0.36 
Bump @truffle/hdwallet-provider from 1.0.35 to 1.0.36
 2020-06-26 10:17:29 +02:00
dependabot[bot]
1e19460918
Bump @truffle/hdwallet-provider from 1.0.35 to 1.0.36 
Bumps [@truffle/hdwallet-provider](https://github.com/trufflesuite/truffle) from 1.0.35 to 1.0.36.
- [Release notes](https://github.com/trufflesuite/truffle/releases)
- [Commits](https://github.com/trufflesuite/truffle/compare/@truffle/hdwallet-provider@1.0.35...@truffle/hdwallet-provider@1.0.36)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-26 01:03:24 +00:00
Ahmed Ali
ae39f7df28 fix readme 2020-06-25 16:03:42 +02:00
arsenyjin
c9de363919 wip encrypt error 2020-06-25 15:52:33 +02:00
Ahmed Ali
93e7c59118
Merge pull request #99 from oceanprotocol/feature/unit-testing 
Feature/unit-testing-beta [Part-1]
 2020-06-25 15:52:17 +02:00
Ahmed Ali
dd64062f8c add download method for provider 2020-06-25 13:29:32 +02:00
Ahmed Ali
799c2e98f2 fix initialize 2020-06-25 12:10:53 +02:00
kin
22d9c30265
Merge pull request #107 from oceanprotocol/feature/unit-testing 
Fix/args for encrypt method
 2020-06-25 09:42:06 +02:00
Ahmed Ali
2d060ff79b fix args for encrypt method 2020-06-25 09:40:00 +02:00
Ahmed Ali
f8121ce31c
minor link fix 2020-06-25 09:23:37 +02:00
Ahmed Ali
ec5220c9ff
Update README.md 2020-06-25 09:22:22 +02:00
Ahmed Ali
72c0b12fd4
Merge pull request #106 from oceanprotocol/fix/readme 
fix/readme
 2020-06-25 09:21:25 +02:00
Ahmed Ali
91c953485b
Rename README_simpleflow.md to README_simple_flow.md 2020-06-25 09:18:59 +02:00
Ahmed Ali
bbd9067e3d
minor fix 2020-06-25 09:17:34 +02:00
Ahmed Ali
a35740d130
Update README.md 2020-06-25 09:15:52 +02:00
Ahmed Ali
6c01e148e9
Merge pull request #105 from oceanprotocol/dependabot/npm_and_yarn/types/node-14.0.14 
Bump @types/node from 14.0.13 to 14.0.14
 2020-06-25 08:48:49 +02:00
dependabot[bot]
b4b3a98989
Bump @types/node from 14.0.13 to 14.0.14 
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.0.13 to 14.0.14.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-25 01:08:10 +00:00
arsenyjin
712bb76dbc wip ocean.assets.create 2020-06-25 00:18:47 +02:00
arsenyjin
67eaca6c56 Merge branch 'feature/unit-testing' into feature/marketplace-flow 2020-06-24 20:55:36 +02:00
arsenyjin
4b4949126d fix conflicts 2020-06-24 20:55:10 +02:00