Merge branch 'latest' into 10.1.0

# Conflicts:
#	package.json
This commit is contained in:
Alberto
2017-06-08 10:31:06 +01:00
143 changed files with 2643 additions and 1212 deletions

View File

@@ -29,31 +29,34 @@
},
"homepage": "http://www.ag-grid.com/",
"devDependencies": {
"babel-core": "6.24.x",
"babel-loader": "6.4.x",
"babel-preset-es2015": "6.24.x",
"babel-preset-react": "6.24.x",
"babel-preset-stage-0": "6.24.x",
"babel-preset-stage-1": "6.24.x",
"css-loader": "0.23.x",
"style-loader": "0.13.x",
"webpack": "1.12.x",
"webpack-dev-server": "1.14.x"
},
"dependencies": {
"ag-grid": "10.0.x",
"ag-grid-enterprise": "10.0.x",
"ag-grid-react": "10.0.x",
"bootstrap": "^3.3.7",
"d3": "4.9.1",
"file-loader": "^0.11.1",
"lodash": "4.17.4",
"react": "15.5.x",
"react-dom": "15.5.x",
"react-redux": "5.0.x",
"redux": "3.6.x",
"rimraf": "2.5.x"
}
"babel-core": "6.24.x",
"babel-loader": "6.4.x",
"babel-preset-es2015": "6.24.x",
"babel-preset-react": "6.24.x",
"babel-preset-stage-0": "6.24.x",
"babel-preset-stage-1": "6.24.x",
"css-loader": "0.23.x",
"mkdirp": "0.5.1",
"ncp": "2.0.0",
"rimraf": "2.5.x",
"style-loader": "0.13.x",
"webpack": "1.12.x",
"webpack-dev-server": "1.14.x"
},
"dependencies": {
"bootstrap": "3.3.7",
"d3": "4.9.1",
"file-loader": "0.11.1",
"lodash": "4.17.4",
"react": "15.5.x",
"react-dom": "15.5.x",
"react-redux": "5.0.x",
"redux": "3.6.x",
"url-search-params-polyfill": "1.2.0",
"ag-grid": "10.1.x",
"ag-grid-enterprise": "10.1.x",
"ag-grid-react": "10.1.x"
}
}