Merge branch 'master' into jasmine-chrome-headless

pull/12657/head
Román Jiménez 7 years ago
commit 9173146bbb

@ -47,6 +47,7 @@ Development
### Bug fixes / enhancements
* Improved tests. Introduced headless chrome for our spec runners (#12657)
* Fix histogram range sliders stick on buckets (#12661)
* Fix Time Series resize when switching to advanced mode (#12124)
* Fix adding/removing widgets when having Time Series (#12123, #12402, #12655)
* Enhancements on superadmin imports & exports endpoints (#12254)

28
npm-shrinkwrap.json generated

@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
"version": "4.9.53",
"version": "4.9.54",
"dependencies": {
"abbrev": {
"version": "1.1.0",
@ -722,14 +722,14 @@
"resolved": "https://registry.npmjs.org/camshaft-reference/-/camshaft-reference-0.33.0.tgz"
},
"caniuse-lite": {
"version": "1.0.30000721",
"version": "1.0.30000722",
"from": "caniuse-lite@>=1.0.30000718 <2.0.0",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000721.tgz"
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000722.tgz"
},
"carto": {
"version": "0.15.1-cdb4",
"from": "cartodb/carto#master",
"resolved": "git://github.com/cartodb/carto.git#a48ba58cae13328bf878310521a823e9699bab19"
"resolved": "git://github.com/cartodb/carto.git#cbe66020f98647429d2bb04b7cf73dcf194f2abf"
},
"cartocolor": {
"version": "4.0.0",
@ -739,7 +739,7 @@
"cartodb-deep-insights.js": {
"version": "0.0.3",
"from": "cartodb/deep-insights.js#master",
"resolved": "git://github.com/cartodb/deep-insights.js.git#197c8a09ee99116b3972f3f83be76b611dd461dd",
"resolved": "git://github.com/cartodb/deep-insights.js.git#c6687fb9fb9a782fa7f8aa11ecd11a9de6e883a5",
"dependencies": {
"node-polyglot": {
"version": "2.2.2",
@ -756,7 +756,7 @@
"cartodb.js": {
"version": "4.0.0-alpha.1",
"from": "cartodb/cartodb.js#v4",
"resolved": "git://github.com/cartodb/cartodb.js.git#09f11fb6e409a1e1b784d8909a88f6749ca8c093"
"resolved": "git://github.com/cartodb/cartodb.js.git#ca734e874bc1aaaaef70dc4e827ceb95af11dc4b"
},
"caseless": {
"version": "0.12.0",
@ -896,9 +896,9 @@
"resolved": "http://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"
},
"core-js": {
"version": "2.5.0",
"version": "2.5.1",
"from": "core-js@>=2.4.0 <3.0.0",
"resolved": "http://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz"
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz"
},
"core-util-is": {
"version": "1.0.2",
@ -1063,9 +1063,9 @@
"optional": true
},
"electron-to-chromium": {
"version": "1.3.19",
"version": "1.3.20",
"from": "electron-to-chromium@>=1.3.18 <2.0.0",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.19.tgz"
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.20.tgz"
},
"elliptic": {
"version": "6.4.0",
@ -1209,9 +1209,9 @@
"resolved": "http://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz",
"dependencies": {
"acorn": {
"version": "5.1.1",
"version": "5.1.2",
"from": "acorn@>=5.0.0 <6.0.0",
"resolved": "http://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz"
"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz"
},
"object-keys": {
"version": "1.0.11",
@ -2371,9 +2371,9 @@
"resolved": "http://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz"
},
"regex-cache": {
"version": "0.4.3",
"version": "0.4.4",
"from": "regex-cache@>=0.4.2 <0.5.0",
"resolved": "http://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz"
"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"
},
"regexpu-core": {
"version": "2.0.0",

@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
"version": "4.9.53",
"version": "4.9.54",
"description": "CARTO UI frontend",
"repository": {
"type": "git",
@ -58,22 +58,22 @@
"git-rev": "0.2.1",
"glob": "7.1.1",
"grunt": "1.0.1",
"grunt-available-tasks": "0.5.4",
"grunt-aws": "0.3.0",
"grunt-available-tasks": "0.6.3",
"grunt-aws": "0.6.2",
"grunt-browserify": "5.0.0",
"grunt-cli": "~0.1.13",
"grunt-contrib-clean": "0.6.0",
"grunt-contrib-clean": "0.7.0",
"grunt-contrib-compass": "1.0.4",
"grunt-contrib-compress": "0.13.0",
"grunt-contrib-compress": "0.14.0",
"grunt-contrib-concat": "1.0.1",
"grunt-contrib-connect": "0.11.2",
"grunt-contrib-copy": "0.8.1",
"grunt-contrib-jasmine": "CartoDB/grunt-contrib-jasmine#headless-chrome",
"grunt-contrib-jst": "CartoDB/grunt-contrib-jst#master",
"grunt-contrib-jst": "CartoDB/grunt-contrib-jst#merge-master",
"grunt-contrib-uglify": "2.0.x",
"grunt-contrib-watch": "1.0.0",
"grunt-exorcise": "2.1.0",
"grunt-postcss": "0.5.5",
"grunt-exorcise": "2.1.1",
"grunt-postcss": "0.7.2",
"grunt-sass": "2.0.0",
"grunt-timer": "0.3.3",
"jasmine": "2.5.2",

Loading…
Cancel
Save