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 |
|
greenkeeper[bot]
|
6d20c4872e
|
chore(package): update lockfile package-lock.json
|
2018-12-16 10:27:52 +00:00 |
|
greenkeeper[bot]
|
d999ca441b
|
chore(package): update rollup to version 0.68.0
|
2018-12-16 10:27:49 +00:00 |
|
diminator
|
d73df95563
|
export EventListener
|
2018-12-15 15:25:57 +01:00 |
|
Sebastian Gerske
|
3e7d45a67d
|
v0.2.4
|
2018-12-14 17:06:18 +01:00 |
|
Sebastian Gerske
|
d6495036d7
|
Merge branch 'develop' into fix/file_download
|
2018-12-14 16:15:36 +01:00 |
|
Sebastian Gerske
|
604433dc50
|
Merge pull request #77 from oceanprotocol/feature/assetId-prefixed-with-0x
Make assetId always prefixed with "0x"
|
2018-12-14 16:15:12 +01:00 |
|
Sebastian Gerske
|
c806ba172b
|
update packages
|
2018-12-14 16:12:36 +01:00 |
|
Sebastian Gerske
|
77a410c607
|
removed file-saver and added a callback with the content
|
2018-12-14 16:12:23 +01:00 |
|
Sebastian Gerske
|
85496f7002
|
added the check for the status of the template that is used to sign the service agreement
|
2018-12-14 16:11:26 +01:00 |
|
Sebastian Gerske
|
1724412dd7
|
adapted unit tets to the code
|
2018-12-14 15:30:23 +01:00 |
|
ssallam
|
c2f77295ce
|
Fix tests.
|
2018-12-14 14:07:41 +01:00 |
|
ssallam
|
233aede5f6
|
Generate assetId with 0x prefix, update all references to reflect this. This makes it similar to squid-py and fixes an issue in payAsset where the asset id in the condition param had double 0x prefix when paying a service agreement for an asset created in squid-py.
|
2018-12-14 13:40:08 +01:00 |
|
Sebastian Gerske
|
e1b1642907
|
Merge pull request #75 from oceanprotocol/defect/brizo-purchase-endpoint
Fix brizo purchaseEndpoint.
|
2018-12-12 21:16:42 +01:00 |
|
ssallam
|
968583e2dd
|
Fix brizo purchaseEndpoint.
|
2018-12-12 20:52:11 +01:00 |
|
Sebastian Gerske
|
981bb8346e
|
Merge pull request #74 from oceanprotocol/version/v0.2.3
Version/v0.2.3
|
2018-12-12 17:07:48 +01:00 |
|
Sebastian Gerske
|
33b5004e3f
|
v0.2.3
|
2018-12-12 16:42:47 +01:00 |
|
Sebastian Gerske
|
1b1a309990
|
update packages
|
2018-12-12 16:29:40 +01:00 |
|
Sebastian Gerske
|
6e4100192c
|
Merge pull request #73 from oceanprotocol/greenkeeper/@oceanprotocol/secret-store-client-0.0.13
Update @oceanprotocol/secret-store-client to the latest version 🚀
|
2018-12-12 16:26:59 +01:00 |
|
greenkeeper[bot]
|
e910ebad07
|
chore(package): update lockfile package-lock.json
|
2018-12-12 14:35:32 +00:00 |
|
greenkeeper[bot]
|
3392a14458
|
fix(package): update @oceanprotocol/secret-store-client to version 0.0.13
|
2018-12-12 14:35:25 +00:00 |
|
Sebastian Gerske
|
66ab665e62
|
Merge pull request #72 from oceanprotocol/feature/verbose
Feature/verbose
|
2018-12-12 07:44:34 +01:00 |
|
Sebastian Gerske
|
11164294d5
|
v0.2.2
|
2018-12-11 17:43:12 +01:00 |
|
Sebastian Gerske
|
b2cebf7748
|
added verbose flag to config
|
2018-12-11 17:41:10 +01:00 |
|
Sebastian Gerske
|
c91a666fd8
|
Merge pull request #57 from oceanprotocol/feature/trilobite_countdown
added buy asset and grant access samples, prepare for consumption
|
2018-12-10 16:59:32 +01:00 |
|
Sebastian Gerske
|
213261bcbb
|
added file-saver again
|
2018-12-10 13:27:41 +01:00 |
|
Sebastian Gerske
|
ce009dcd94
|
remove fs because it does not work in the browser
|
2018-12-10 13:26:33 +01:00 |
|
Sebastian Gerske
|
83ce375588
|
remove dead code
|
2018-12-10 13:26:07 +01:00 |
|
Sebastian Gerske
|
8e779a171e
|
v0.2.1
|
2018-12-10 10:28:31 +01:00 |
|