Commit Graph

  • 55d9592565
    Merge pull request #225 from oceanprotocol/feature/compute Matthias Kretschmann 2020-05-19 15:18:53 +0200
  • 5015d26cea asset details fix #225 mihaisc 2020-05-19 15:47:21 +0300
  • a6b0ca4be6 test fix mihaisc 2020-05-19 15:24:40 +0300
  • 3c8cbcc22b
    Bump react-transition-group from 4.3.0 to 4.4.1 in /client #279 dependabot-preview[bot] 2020-05-19 11:59:42 +0000
  • 3aa79cd7dc
    Merge pull request #277 from oceanprotocol/dependabot/npm_and_yarn/client/web3-1.2.7 dependabot-preview[bot] 2020-05-19 11:56:22 +0000
  • 0f55b73dc5
    Merge pull request #278 from oceanprotocol/dependabot/npm_and_yarn/client/oceanprotocol/squid-2.1.3 dependabot-preview[bot] 2020-05-19 11:56:08 +0000
  • daf39e8ed2
    Bump @types/jest from 25.2.2 to 25.2.3 in /client #280 dependabot-preview[bot] 2020-05-19 11:30:43 +0000
  • ef013c0d10
    Bump @oceanprotocol/squid from 2.1.2 to 2.1.3 in /client #278 dependabot-preview[bot] 2020-05-19 11:28:05 +0000
  • 7184a7bb66
    Bump web3 from 1.2.6 to 1.2.7 in /client #277 dependabot-preview[bot] 2020-05-19 11:26:31 +0000
  • 28b213d2fc Merge branch 'feature/compute' of https://github.com/oceanprotocol/commons into feature/compute mihaisc 2020-05-19 14:24:04 +0300
  • 55bf9f314f test fixes mihaisc 2020-05-19 14:21:34 +0300
  • 51b1dd228f
    Bump @typescript-eslint/parser from 2.33.0 to 2.34.0 #272 dependabot-preview[bot] 2020-05-19 09:19:03 +0000
  • 3511bafdf3
    Bump eslint-plugin-prettier from 3.1.2 to 3.1.3 #273 dependabot-preview[bot] 2020-05-19 09:18:59 +0000
  • b93f005154
    Merge branch 'master' into feature/compute Matthias Kretschmann 2020-05-19 11:18:05 +0200
  • 7cba1cd148
    Merge pull request #271 from oceanprotocol/dependabot/npm_and_yarn/server/types/jest-25.2.3 dependabot-preview[bot] 2020-05-19 09:17:19 +0000
  • 876d7c22d3
    Merge pull request #230 from oceanprotocol/dependabot/npm_and_yarn/prettier-2.0.5 dependabot-preview[bot] 2020-05-19 09:17:03 +0000
  • 3434734be6
    Bump @release-it/bumper from 1.1.0 to 1.1.1 #274 dependabot-preview[bot] 2020-05-19 08:52:50 +0000
  • 87bcba5af7
    Bump @types/jest from 25.2.2 to 25.2.3 in /server #271 dependabot-preview[bot] 2020-05-19 08:45:11 +0000
  • d058fc815d
    formatting for new prettier rules #230 Matthias Kretschmann 2020-05-19 10:36:18 +0200
  • d916f0df1e
    security fixes Matthias Kretschmann 2020-05-19 10:34:59 +0200
  • 2884015678
    small refactor Matthias Kretschmann 2020-05-19 10:28:02 +0200
  • 7d09350967
    test fixes Matthias Kretschmann 2020-05-19 10:18:40 +0200
  • fe37382833
    Merge branch 'master' into feature/compute Matthias Kretschmann 2020-05-19 10:10:23 +0200
  • 0d3bdc7a2c
    Bump prettier from 1.19.1 to 2.0.5 dependabot-preview[bot] 2020-05-19 08:10:27 +0000
  • 00e2d8acb5
    Merge pull request #270 from oceanprotocol/fix/stylelint Matthias Kretschmann 2020-05-19 10:08:43 +0200
  • b7408a3c9b
    remove codacy #270 Matthias Kretschmann 2020-05-19 09:46:39 +0200
  • 4ddd607499
    remove stylelint Matthias Kretschmann 2020-05-19 09:21:55 +0200
  • 5d9fee0e69
    Merge branch 'master' into feature/compute Matthias Kretschmann 2020-05-19 09:08:06 +0200
  • 780d9db16e
    Merge pull request #263 from oceanprotocol/dependabot/npm_and_yarn/client/react-helmet-6.0.0 dependabot-preview[bot] 2020-05-19 07:01:56 +0000
  • 7905a1f8a9
    new Helmet import #263 Matthias Kretschmann 2020-05-19 08:37:51 +0200
  • 17cdb87b8d
    Merge branch 'master' into feature/compute Alex Coseru 2020-05-19 02:16:14 +0300
  • 4b3130e0e9
    Merge pull request #269 from oceanprotocol/dependabot/npm_and_yarn/server/morgan-1.10.0 dependabot-preview[bot] 2020-05-18 22:27:48 +0000
  • 1014ab02cf
    Merge pull request #268 from oceanprotocol/dependabot/npm_and_yarn/server/types/request-2.48.5 dependabot-preview[bot] 2020-05-18 22:27:34 +0000
  • cb68e7ef3d
    Bump morgan from 1.9.1 to 1.10.0 in /server #269 dependabot-preview[bot] 2020-05-18 18:08:27 +0000
  • cc3bc599b4
    Bump @types/request from 2.48.4 to 2.48.5 in /server #268 dependabot-preview[bot] 2020-05-18 18:07:30 +0000
  • 3ce29a59b9
    Bump react-helmet from 5.2.1 to 6.0.0 in /client dependabot-preview[bot] 2020-05-18 18:06:21 +0000
  • 73ba7d4cdd
    Merge pull request #266 from oceanprotocol/dependabot/npm_and_yarn/client/types/react-dom-16.9.8 dependabot-preview[bot] 2020-05-18 18:02:56 +0000
  • f431b66a41
    Merge pull request #265 from oceanprotocol/dependabot/npm_and_yarn/client/jest-mock-axios-4.0.0 dependabot-preview[bot] 2020-05-18 18:02:42 +0000
  • 5d1377fa24
    Merge pull request #267 from oceanprotocol/dependabot/npm_and_yarn/client/query-string-6.12.1 dependabot-preview[bot] 2020-05-18 18:02:24 +0000
  • cd81fa3d9a
    Merge pull request #264 from oceanprotocol/dependabot/npm_and_yarn/client/oceanprotocol/squid-2.1.2 dependabot-preview[bot] 2020-05-18 18:02:13 +0000
  • c69797cb02
    Bump query-string from 6.11.1 to 6.12.1 in /client #267 dependabot-preview[bot] 2020-05-18 17:41:22 +0000
  • 6d834fb6a6
    Bump @types/react-dom from 16.9.5 to 16.9.8 in /client #266 dependabot-preview[bot] 2020-05-18 17:40:23 +0000
  • 0dda840f92
    Bump jest-mock-axios from 3.2.0 to 4.0.0 in /client #265 dependabot-preview[bot] 2020-05-18 17:38:55 +0000
  • 41600c2f30
    Bump @oceanprotocol/squid from 2.1.1 to 2.1.2 in /client #264 dependabot-preview[bot] 2020-05-18 17:37:45 +0000
  • 54f437a6e6 fix tests alexcos20 2020-05-18 10:02:40 -0700
  • 456e9a6607
    Merge pull request #262 from oceanprotocol/dependabot/npm_and_yarn/client/ipfs-http-client-44.1.0 dependabot-preview[bot] 2020-05-18 16:22:02 +0000
  • 8a48afb535
    Bump ipfs-http-client from 39.0.2 to 44.1.0 in /client #262 dependabot-preview[bot] 2020-05-18 16:00:22 +0000
  • 0dfaf4c069
    Merge pull request #261 from oceanprotocol/dependabot/npm_and_yarn/client/react-dropzone-11.0.1 dependabot-preview[bot] 2020-05-18 15:56:39 +0000
  • 23f956092a
    Merge pull request #260 from oceanprotocol/dependabot/npm_and_yarn/client/moment-2.25.3 dependabot-preview[bot] 2020-05-18 15:56:22 +0000
  • 8bed302e9e
    Merge pull request #259 from oceanprotocol/dependabot/npm_and_yarn/client/react-collapsed-3.0.0 dependabot-preview[bot] 2020-05-18 15:56:07 +0000
  • f6be84e76f remove css lint alexcos20 2020-05-18 08:56:02 -0700
  • 8284a407f8
    Merge pull request #258 from oceanprotocol/dependabot/npm_and_yarn/client/testing-library/react-10.0.4 dependabot-preview[bot] 2020-05-18 15:55:40 +0000
  • 074250e544
    Merge pull request #257 from oceanprotocol/dependabot/npm_and_yarn/client/truffle/hdwallet-provider-1.0.35 dependabot-preview[bot] 2020-05-18 15:55:27 +0000
  • 445c86f60d
    Bump react-dropzone from 10.2.1 to 11.0.1 in /client #261 dependabot-preview[bot] 2020-05-18 15:30:00 +0000
  • 97fda45977
    Bump moment from 2.24.0 to 2.25.3 in /client #260 dependabot-preview[bot] 2020-05-18 15:28:52 +0000
  • b97205a0c2
    Bump react-collapsed from 2.2.3 to 3.0.0 in /client #259 dependabot-preview[bot] 2020-05-18 15:27:40 +0000
  • c0e15d5695
    Bump @testing-library/react from 10.0.1 to 10.0.4 in /client #258 dependabot-preview[bot] 2020-05-18 15:26:28 +0000
  • 401d8349e6
    Bump @truffle/hdwallet-provider from 1.0.33 to 1.0.35 in /client #257 dependabot-preview[bot] 2020-05-18 15:25:35 +0000
  • 9c93c92e10
    Merge pull request #244 from oceanprotocol/dependabot/npm_and_yarn/auto-changelog-2.0.0 dependabot-preview[bot] 2020-05-18 13:30:24 +0000
  • 8505c1efd0
    Merge pull request #246 from oceanprotocol/dependabot/npm_and_yarn/release-it-13.6.1 dependabot-preview[bot] 2020-05-18 13:30:08 +0000
  • 7b02cbe52f
    Merge pull request #256 from oceanprotocol/dependabot/npm_and_yarn/client/typescript-3.9.2 Matthias Kretschmann 2020-05-18 15:29:34 +0200
  • a34c37f212
    Merge pull request #235 from oceanprotocol/dependabot/npm_and_yarn/server/typescript-3.9.2 dependabot-preview[bot] 2020-05-18 13:29:13 +0000
  • 98c459241f
    Merge pull request #249 from oceanprotocol/dependabot/npm_and_yarn/server/types/jest-25.2.2 dependabot-preview[bot] 2020-05-18 13:14:33 +0000
  • 6a6688b2e0
    Bump typescript from 3.8.3 to 3.9.2 in /client #256 dependabot-preview[bot] 2020-05-18 12:39:47 +0000
  • d4cb1f78bd
    Bump @types/jest from 25.1.4 to 25.2.2 in /server #249 dependabot-preview[bot] 2020-05-18 12:38:03 +0000
  • 13780d6a82
    Merge pull request #255 from oceanprotocol/dependabot/npm_and_yarn/client/sindresorhus/slugify-1.0.0 Matthias Kretschmann 2020-05-18 14:37:58 +0200
  • dba1f8f878
    Bump typescript from 3.8.3 to 3.9.2 in /server #235 dependabot-preview[bot] 2020-05-18 12:37:38 +0000
  • 6e12b3f1be
    Merge pull request #253 from oceanprotocol/dependabot/npm_and_yarn/client/oceanprotocol/squid-2.1.1 dependabot-preview[bot] 2020-05-18 12:36:14 +0000
  • 04f5db99f0
    Merge pull request #254 from oceanprotocol/dependabot/npm_and_yarn/client/types/react-16.9.35 dependabot-preview[bot] 2020-05-18 12:35:52 +0000
  • ca6ee70da8
    Merge pull request #252 from oceanprotocol/dependabot/npm_and_yarn/client/react-scripts-3.4.1 dependabot-preview[bot] 2020-05-18 12:35:31 +0000
  • 274a9507e3
    Bump auto-changelog from 1.16.2 to 2.0.0 #244 dependabot-preview[bot] 2020-05-18 12:31:20 +0000
  • 2dafe64a00
    Bump release-it from 13.6.0 to 13.6.1 #246 dependabot-preview[bot] 2020-05-18 12:31:14 +0000
  • e8bab5749b
    Merge pull request #248 from oceanprotocol/dependabot/npm_and_yarn/eslint-config-prettier-6.11.0 dependabot-preview[bot] 2020-05-18 12:29:50 +0000
  • 3f5def552e
    Merge pull request #250 from oceanprotocol/dependabot/npm_and_yarn/cypress-4.5.0 Matthias Kretschmann 2020-05-18 14:29:31 +0200
  • 7df95c69ab
    Merge pull request #243 from oceanprotocol/dependabot/npm_and_yarn/typescript-eslint/parser-2.33.0 dependabot-preview[bot] 2020-05-18 12:28:47 +0000
  • 024b873614
    Merge pull request #251 from oceanprotocol/dependabot/npm_and_yarn/server/ts-node-8.10.1 dependabot-preview[bot] 2020-05-18 12:28:05 +0000
  • 9c16ad30e1
    Merge pull request #247 from oceanprotocol/dependabot/npm_and_yarn/server/types/supertest-2.0.9 dependabot-preview[bot] 2020-05-18 12:27:48 +0000
  • 8fb906b168
    Merge pull request #245 from oceanprotocol/dependabot/npm_and_yarn/server/types/express-4.17.6 dependabot-preview[bot] 2020-05-18 12:27:28 +0000
  • 20cc62b2fa
    Merge pull request #242 from oceanprotocol/dependabot/npm_and_yarn/server/express-validator-6.5.0 dependabot-preview[bot] 2020-05-18 12:27:12 +0000
  • 99fa2e965b fix lint alexcos20 2020-05-18 05:09:04 -0700
  • c82f31dc2d
    Bump @sindresorhus/slugify from 0.11.0 to 1.0.0 in /client #255 dependabot-preview[bot] 2020-05-18 11:49:16 +0000
  • d11dc641cf
    Bump @types/react from 16.9.23 to 16.9.35 in /client #254 dependabot-preview[bot] 2020-05-18 11:48:03 +0000
  • 8e547f9b9d
    Bump @oceanprotocol/squid from 2.0.0-beta.4 to 2.1.1 in /client #253 dependabot-preview[bot] 2020-05-18 11:46:54 +0000
  • 112f2ba00c
    Bump react-scripts from 3.4.0 to 3.4.1 in /client #252 dependabot-preview[bot] 2020-05-18 11:45:42 +0000
  • d5ff3c1df2
    Bump ts-node from 8.7.0 to 8.10.1 in /server #251 dependabot-preview[bot] 2020-05-18 08:54:53 +0000
  • f7d4a5a994
    Bump cypress from 4.2.0 to 4.5.0 #250 dependabot-preview[bot] 2020-05-18 08:54:31 +0000
  • abab1b1ffb
    Bump eslint-config-prettier from 6.10.0 to 6.11.0 #248 dependabot-preview[bot] 2020-05-18 08:53:51 +0000
  • c1296ed172
    Bump @types/supertest from 2.0.8 to 2.0.9 in /server #247 dependabot-preview[bot] 2020-05-18 08:53:38 +0000
  • c00911c886
    Bump @types/express from 4.17.3 to 4.17.6 in /server #245 dependabot-preview[bot] 2020-05-18 08:53:05 +0000
  • c539db7141
    Bump @typescript-eslint/parser from 2.24.0 to 2.33.0 #243 dependabot-preview[bot] 2020-05-18 08:52:18 +0000
  • af5dd6339a
    Bump express-validator from 6.4.1 to 6.5.0 in /server #242 dependabot-preview[bot] 2020-05-18 08:52:07 +0000
  • f70612300d
    Merge pull request #233 from oceanprotocol/dependabot/npm_and_yarn/server/types/node-14.0.1 dependabot-preview[bot] 2020-05-17 01:15:45 +0000
  • 77744239e8
    Bump ipfs-http-client from 39.0.2 to 44.0.3 in /client #234 dependabot-preview[bot] 2020-05-17 00:48:47 +0000
  • cd9364167d
    Bump @types/node from 13.9.2 to 14.0.1 in /server #233 dependabot-preview[bot] 2020-05-17 00:46:57 +0000
  • 24316aa19d
    Merge pull request #241 from oceanprotocol/dependabot/npm_and_yarn/client/source-map-explorer-2.4.2 dependabot-preview[bot] 2020-05-17 00:45:30 +0000
  • dd6f1537c9
    Merge pull request #238 from oceanprotocol/dependabot/npm_and_yarn/server/sendgrid/mail-7.1.1 dependabot-preview[bot] 2020-05-17 00:45:05 +0000
  • c642fa0ee7
    Merge pull request #240 from oceanprotocol/dependabot/npm_and_yarn/client/types/jest-25.2.2 Matthias Kretschmann 2020-05-17 02:44:34 +0200
  • 8e06fc63e3
    Merge pull request #239 from oceanprotocol/dependabot/npm_and_yarn/client/react-datepicker-2.16.0 dependabot-preview[bot] 2020-05-17 00:43:57 +0000
  • c64adf2400
    Merge pull request #236 from oceanprotocol/dependabot/npm_and_yarn/server/nodemon-2.0.4 dependabot-preview[bot] 2020-05-17 00:43:33 +0000
  • 32a8086753
    Merge pull request #237 from oceanprotocol/dependabot/npm_and_yarn/client/testing-library/jest-dom-5.7.0 dependabot-preview[bot] 2020-05-17 00:42:57 +0000