Skip to content

Commit

Permalink
Merge master into branch
Browse files Browse the repository at this point in the history
  • Loading branch information
VictorVelarde committed Jul 6, 2018
2 parents dfc02ec + 061dbb6 commit 03523e9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -76,3 +76,4 @@ doc/manual/build
yarn.lock
public/static.tar.gz
compilation-stats.json
npm-debug.log.*
1 change: 1 addition & 0 deletions NEWS.md
Expand Up @@ -18,6 +18,7 @@ This release introduces a new API Key system. In order to migrate existing users

### Bug fixes / enhancements
* Fix wrong style after creating a feature (https://github.com/CartoDB/cartodb/issues/13680)
* Map instantiation is now debounced thanks to Carto.js 4.0.12 (https://github.com/CartoDB/cartodb/pull/14142)
* Fix bug computing next page in datasets (https://github.com/CartoDB/cartodb/issues/14138)
* Move to the last page after adding a row (https://github.com/CartoDB/cartodb/issues/10720)
* Fix pagination after deleting a row (https://github.com/CartoDB/cartodb/issues/9868)
Expand Down
12 changes: 6 additions & 6 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
"version": "4.12.45-13680",
"version": "4.12.46",
"description": "CARTO UI frontend",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,7 +33,7 @@
"d3-queue": "^3.0.7",
"fastclick": "^1.0.6",
"html-webpack-plugin": "^3.2.0",
"internal-carto.js": "CartoDB/carto.js#v4.0.11-1",
"internal-carto.js": "CartoDB/carto.js#v4.0.12",
"jquery": "2.1.4",
"leaflet": "CartoDB/Leaflet#v1.3.1-carto1",
"moment": "2.18.1",
Expand Down

0 comments on commit 03523e9

Please sign in to comment.