Merge branch 'dev' into 1.2-merge1
# Conflicts: # package.json # src/utils/popup/index.js # yarn.lock
Showing
build/gen-single-config.js
0 → 100644
This diff is collapsed.
This diff is collapsed.
{ | { | ||
"name": "element-ui", | "name": "element-ui", | ||
"version": "1.1.5", | "version": "1.1.6", | ||
"description": "A Component Library for Vue.js.", | "description": "A Component Library for Vue.js.", | ||
"main": "lib/element-ui.common.js", | "main": "lib/element-ui.common.js", | ||
"files": [ | "files": [ | ||
... | @@ -24,7 +24,7 @@ | ... | @@ -24,7 +24,7 @@ |
"i18n": "node build/bin/i18n.js", | "i18n": "node build/bin/i18n.js", | ||
"lint": "eslint src/**/* test/**/* packages/**/*.{js,vue} build/**/* --quiet", | "lint": "eslint src/**/* test/**/* packages/**/*.{js,vue} build/**/* --quiet", | ||
"pub": "npm run bootstrap && sh build/git-release.sh && sh build/release.sh", | "pub": "npm run bootstrap && sh build/git-release.sh && sh build/release.sh", | ||
"pub:all": "npm run dist:all && lerna publish", | "pub:all": "npm run dist:all && lerna publish --skip-git && git commit -am 'publish independent packages' && git push eleme dev", | ||
"test": "npm run lint && cross-env CI_ENV=/dev/ karma start test/unit/karma.conf.js --single-run", | "test": "npm run lint && cross-env CI_ENV=/dev/ karma start test/unit/karma.conf.js --single-run", | ||
"test:watch": "karma start test/unit/karma.conf.js" | "test:watch": "karma start test/unit/karma.conf.js" | ||
}, | }, | ||
... | @@ -96,7 +96,7 @@ | ... | @@ -96,7 +96,7 @@ |
"karma-sourcemap-loader": "^0.3.7", | "karma-sourcemap-loader": "^0.3.7", | ||
"karma-spec-reporter": "0.0.26", | "karma-spec-reporter": "0.0.26", | ||
"karma-webpack": "^1.8.0", | "karma-webpack": "^1.8.0", | ||
"lerna": "2.0.0-beta.18", | "lerna": "^2.0.0-beta.32", | ||
"lolex": "^1.5.1", | "lolex": "^1.5.1", | ||
"markdown-it": "^6.1.1", | "markdown-it": "^6.1.1", | ||
"markdown-it-anchor": "^2.5.0", | "markdown-it-anchor": "^2.5.0", | ||
... | ... |
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
src/locale/lang/el.js
0 → 100644
This diff is collapsed.
src/locale/lang/fi.js
0 → 100644
This diff is collapsed.
This diff is collapsed.
src/locale/lang/sv-SE.js
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment