Skip to content

Commit d09c2a7

Browse files
author
Jeff
committed
Merge remote-tracking branch 'origin/ft/vuepress' into ft/vuepress-no-cli
# Conflicts: # .babelrc # .gitignore # README.md # build/webpack.base.conf.js # build/webpack.dev.conf.js # build/webpack.prod.conf.js # build/webpack.site.conf.js # dev/dev.html # docs/gitbook/Api/Props.md # package.json # test/unit/karma.conf.js # test/unit/specs/Select.spec.js # tests/helpers.js # tests/unit/.eslintrc.js # tests/unit/Ajax.spec.js # tests/unit/Deselecting.spec.js # tests/unit/Dropdown.spec.js # tests/unit/Filtering.spec.js # tests/unit/Labels.spec.js # tests/unit/Layout.spec.js # tests/unit/ObjectIndex.spec.js # tests/unit/ReactiveOptions.spec.js # tests/unit/Selecting.spec.js # tests/unit/Tagging.spec.js # tests/unit/TypeAhead.spec.js # yarn.lock
2 parents 03917c4 + c948859 commit d09c2a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+5075
-1647
lines changed

‎.codeclimate.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎.csslintrc

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎.eslintignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.eslintrc

Lines changed: 0 additions & 185 deletions
This file was deleted.

‎.gitignore

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,28 @@
11
.DS_Store
22
node_modules
3-
npm-debug.log
3+
4+
# local env files
5+
.env.local
6+
.env.*.local
7+
8+
# Log files
9+
npm-debug.log*
10+
yarn-debug.log*
11+
yarn-error.log*
12+
13+
# Editor directories and files
414
.idea
15+
.vscode
16+
*.suo
17+
*.ntvs*
18+
*.njsproj
19+
*.sln
20+
*.sw*
21+
22+
# Project specific
23+
coverage
24+
dist
525
test/unit/coverage
6-
.coveralls.yml
7-
.flowconfig
826
package-lock.json
9-
docs/gitbook/_book
10-
docs/node_modules
11-
site
12-
_book
13-
dist
14-
coverage
27+
dev/dist
28+
docs/.vuepress/dist

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: node_js
22
node_js:
33
- node
4-
after_success:
5-
- codeclimate-test-reporter < ./test/unit/coverage/lcov.info
4+
script:
5+
- yarn test | coveralls

‎CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
## Pull Requests
22

3-
Looks like you want to help out on vue-select.. awesome! Here's a couple things to keep in mind when contributing.
3+
Looks like you want to help out on vue-select.. awesome! Here's a few things to keep in mind when contributing.
44

55
1. If your PR contains multiple commits, try to keep those commits succinct, with descriptive messages. This makes it easier to understand your thought process.
6-
2. Don't run the build before submitting. The build is only run and committed immediately before a new release, and submitting a PR with a build included is just more to parse.
6+
2. **Don't run the build** before submitting. The build is only run and committed immediately before a new release.
77
3. If your PR fixes or references an open issue, be sure to reference it in your message.
88
4. If you're adding new functionality, make sure your code has good test coverage.
99

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# vue-select [![Build Status](https://travis-ci.org/sagalbot/vue-select.svg?branch=master)](https://travis-ci.org/sagalbot/vue-select) ![MIT License](https://img.shields.io/github/license/sagalbot/vue-select.svg?style=flat-square) ![Current Release](https://img.shields.io/github/release/sagalbot/vue-select.svg?style=flat-square)
1+
# vue-select [![Build Status](https://travis-ci.org/sagalbot/vue-select.svg?branch=master)](https://travis-ci.org/sagalbot/vue-select) [![Coverage Status](https://coveralls.io/repos/github/sagalbot/vue-select/badge.svg)](https://coveralls.io/github/sagalbot/vue-select) ![MIT License](https://img.shields.io/github/license/sagalbot/vue-select.svg?style=flat-square) ![Current Release](https://img.shields.io/github/release/sagalbot/vue-select.svg?style=flat-square)
22

33
> A native Vue.js select component that provides similar functionality to Select2 without the overhead of jQuery.
44

‎book.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎build/build-docs.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)