1
0
mirror of https://github.com/oceanprotocol-archive/squid-js.git synced 2024-02-02 15:31:51 +01:00
Commit Graph

495 Commits

Author SHA1 Message Date
Pedro Gutiérrez
537edad8b9 included .editorconfig #66 2019-01-07 17:40:04 +01:00
Pedro Gutiérrez
57f7f72ce6 added information about installation of ganache-cli #66 2019-01-07 17:33:11 +01:00
Javier Cortejoso
b8ca6d1aeb
Merge pull request #97 from oceanprotocol/feature/update_packages
updated packages, keeper-contracts `v0.5.2`
2019-01-07 14:40:55 +01:00
Sebastian Gerske
eba8c2f1f7 updated packages, keeper-contracts v0.5.2 2019-01-07 13:26:25 +01:00
Sebastian Gerske
37a57ae79f
Merge pull request #96 from oceanprotocol/greenkeeper/typedoc-0.14.0
Update typedoc to the latest version 🚀
2019-01-03 07:34:40 +01:00
greenkeeper[bot]
6ec29bcfb6 chore(package): update lockfile package-lock.json 2019-01-03 06:12:01 +00:00
greenkeeper[bot]
cbf7b8287b chore(package): update typedoc to version 0.14.0 2019-01-03 06:11:57 +00:00
Sebastian Gerske
0d54e45939
Merge pull request #91 from oceanprotocol/feature/update_packages
Updated and cleaned packages
2019-01-02 14:33:40 +01:00
Sebastian Gerske
8b4752b76e fix merge conflicts 2019-01-02 14:25:20 +01:00
Sebastian Gerske
8bd4f742a0 Merge remote-tracking branch 'origin/develop' into feature/update_packages
# Conflicts:
#	package-lock.json
#	package.json
2019-01-02 14:17:28 +01:00
Dimitri De Jonghe
391e44aaab
Merge pull request #94 from oceanprotocol/feature/executeagreementtest
added test for failed service agreements
2019-01-02 14:05:07 +01:00
Sebastian Gerske
95eb49d11d
Merge branch 'develop' into feature/executeagreementtest 2018-12-31 14:11:23 +01:00
Sebastian Gerske
a147a8c748
Merge pull request #95 from oceanprotocol/greenkeeper/rollup-1.0.0
Update rollup to the latest version 🚀
2018-12-31 14:11:01 +01:00
greenkeeper[bot]
12f2a46e2c chore(package): update lockfile package-lock.json 2018-12-28 20:54:47 +00:00
greenkeeper[bot]
98639d6ae7 chore(package): update rollup to version 1.0.0 2018-12-28 20:54:42 +00:00
Sebastian Gerske
eb505619c1
Merge branch 'develop' into feature/update_packages 2018-12-19 14:27:52 +01:00
Sebastian Gerske
d587a24555
Merge branch 'develop' into feature/executeagreementtest 2018-12-19 14:27:39 +01:00
Sebastian Gerske
1ec765829a
Merge pull request #93 from oceanprotocol/fix/codacy_coverage
fix codacy coverage
2018-12-19 14:24:30 +01:00
Sebastian Gerske
3b8e424232 added test for failed service agreements 2018-12-19 12:34:07 +01:00
Sebastian Gerske
f0744c23c9 fix codacy coverage 2018-12-19 10:38:02 +01:00
Sebastian Gerske
e289e5e6bd fix codacy coverage 2018-12-19 10:33:43 +01:00
Sebastian Gerske
a4536302a7 fix codacy coverage 2018-12-19 10:10:53 +01:00
Sebastian Gerske
b1df2513e2 cleaned packages
updated to web3 1.0 beta 37
2018-12-19 09:00:35 +01:00
Sebastian Gerske
d6af0d8c9a
Merge pull request #90 from oceanprotocol/fix/signing
add detection for meta mask
2018-12-18 18:05:37 +01:00
Sebastian Gerske
724a29ee80 add detection for meta mask 2018-12-18 15:50:37 +01:00
Samer
0c08a2348b
Merge pull request #89 from oceanprotocol/feature/expose-did-and-idgenerator
Feature/expose did and idgenerator
2018-12-18 02:01:24 +01:00
diminator
800850e288
expose DID and IdGenerator 2018-12-17 22:41:47 +01:00
diminator
e9e1266712 Merge branch 'develop' of github.com:oceanprotocol/squid-js into develop 2018-12-17 18:55:33 +01:00
Dimitri De Jonghe
11ba7b6ff1
Merge pull request #88 from oceanprotocol/fix/circular_dep
fix/circular_dep
2018-12-17 18:54:58 +01:00
diminator
53610ed599 Merge branch 'develop' of github.com:oceanprotocol/squid-js into develop 2018-12-17 18:54:34 +01:00
diminator
487d259d1e
merge 2018-12-17 18:46:29 +01:00
Dimitri De Jonghe
3bd8c75db8
Merge branch 'develop' into fix/circular_dep 2018-12-17 18:44:05 +01:00
Jernej Pregelj
349a6c7cf4
Merge pull request #87 from oceanprotocol/fix/return-urls
return file urls
2018-12-17 17:49:51 +01:00
Jernej Pregelj
e953180700 lint fixes 2018-12-17 17:43:45 +01:00
Sebastian Gerske
dea6ea4770 fix/circular_dep 2018-12-17 17:37:36 +01:00
Jernej Pregelj
81a282af28 return file urls 2018-12-17 16:46:19 +01:00
Sebastian Gerske
c68b882986
Merge pull request #85 from oceanprotocol/feature/update_packages
go to keeper-contracts v0.5.1
2018-12-17 16:37:04 +01:00
Dimitri De Jonghe
e42c975d9f
Merge branch 'develop' into feature/update_packages 2018-12-17 16:15:52 +01:00
Dimitri De Jonghe
94408de8da
Merge pull request #86 from oceanprotocol/fix/0x
Fix/0x
2018-12-17 16:14:51 +01:00
Sebastian Gerske
6ea480fd47 enhanced did handling 2018-12-17 15:54:58 +01:00
Sebastian Gerske
a0648b4b84 remove 0x prefix from serviceAgreementId 2018-12-17 14:29:09 +01:00
Sebastian Gerske
09191fab59 rollback did containing 0x 2018-12-17 14:17:35 +01:00
Sebastian Gerske
3c2f5a2886
Merge branch 'develop' into feature/update_packages 2018-12-17 11:58:46 +01:00
Sebastian Gerske
d6a643772d
Merge pull request #81 from oceanprotocol/feature/export-eventlistener
export EventListener
2018-12-17 11:58:07 +01:00
Sebastian Gerske
4bff3e56ad go to keeper-contracts v0.5.1
updated the rest of the packages
2018-12-17 11:57:42 +01:00
Sebastian Gerske
b901622d20
Merge branch 'develop' into feature/export-eventlistener 2018-12-17 11:26:24 +01:00
Sebastian Gerske
4963d46d63
Merge pull request #83 from oceanprotocol/greenkeeper/rollup-0.68.0
Update rollup to the latest version 🚀
2018-12-17 11:26:11 +01:00
Sebastian Gerske
62c3e77b44
Merge branch 'develop' into feature/export-eventlistener 2018-12-17 11:23:56 +01:00
Sebastian Gerske
b7593e2763
Merge branch 'develop' into greenkeeper/rollup-0.68.0 2018-12-17 11:07:46 +01:00
Sebastian Gerske
72974c49e3
Merge pull request #78 from oceanprotocol/fix/file_download
Fix/file download
2018-12-17 11:07:34 +01:00