Skip to content

Commit

Permalink
Merged updates
Browse files Browse the repository at this point in the history
  • Loading branch information
amanpatel committed Dec 30, 2015
1 parent 3350b8a commit bbe5299
Show file tree
Hide file tree
Showing 54 changed files with 4,401 additions and 1,345 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
@@ -1,6 +1,6 @@
{
"plugins": [
"html" // https://github.com/BenoitZugmeyer/eslint-plugin-html
"eslint-plugin-html" // https://github.com/BenoitZugmeyer/eslint-plugin-html
],
"parser": "babel-eslint",
"env": { // http://eslint.org/docs/user-guide/configuring.html#specifying-environments
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Expand Up @@ -8,3 +8,9 @@ build/
=======
>>>>>>> master
npm-debug.log
static
build

vue-strap.sublime-project

vue-strap.sublime-workspace
10 changes: 10 additions & 0 deletions .travis.yml
@@ -0,0 +1,10 @@
language: node_js
node_js:
- '4.1'
deploy:
provider: npm
email: "i@yuche.me"
api_key:
secure: LJCJj5B+at11PI55rp5xzrbcsE2FvTIPKMR+ZmQ3tlvYIDMChq0zu5kH+oKcBWoVjf9x1xJTMimcSJ85jtd0DpRztiuBIXDhrRpOvGMaZJQZEypzoW0y6Hji/i4Wxc4HZRylDOoJug5VipRlaQwvvZvLhc7uckP1e0dexc0M9ba//I+MrTUDmZGNYKDy5YT1MQY0NdtQd55/ulHy5sNReqBjJ0Rzfo9IHfRge5ZeSoPuQm5lZegB+Z6i6V3XRNixfv4iSMoVysMMufCMTzRkweCJywSZTqJIu4GuJLt4Y2wsSh6b5qNndoTUkI/gJOsTrFDbKromEDulMbR8Xs1r/rzryJ4kZYW2crT8r6yH7S82/S3VmmyVz9liPncNxpKkI4F21izraikSF0qeW1utjd/P0u36D4zltMwMUzKIfHvE0wdIG5tSQOxJRqb5tc/u+++WGEK0nTsRyQpSH/OHKmU/Sj01XVIhSRJrXwbLSSiojFMkUpzhGFPYIHM2wJQ2zBdeqViJvYogUNmcyt0soO1fkU6NKZP312MksUFAZN8nG95t/63c1+NFYlt2M2PtYfbIBbvrTyRkcRGLGX/4CHVX/ZapyKvwGj3p3oFDcuwE0jEqwWFCkEYP3OzannfW11zFy80d6jmY/nfv8jft3er2RbrJGcN4Hqev/fahg28=
on:
branch: master
8 changes: 2 additions & 6 deletions README.md
Expand Up @@ -3,7 +3,7 @@ Bootstrap components built with Vue.js.

This repository contains a set of native Vue.js components based on Bootstrap's markup and CSS. As a result no dependency on jQuery or Bootstrap's JavaScript is required. The only required dependencies are:

* [Vue.js](http://vuejs.org/) (required ^0.12, test with 0.12.10).
* [Vue.js](http://vuejs.org/) (required ^v1.x.x, test with v1.0.8).
* [Bootstrap CSS](http://getbootstrap.com/) (required 3.x.x, test with 3.3.5). VueStrap doesn't depend on a very precise version of Bootstrap.

## Installation
Expand Down Expand Up @@ -68,11 +68,7 @@ See the [documentation](http://yuche.github.io/vue-strap/) with live editable ex
* Build with `npm run build`.

## TODO
- [ ] Vue.js 1.0 support. (When Vue.js 1.0 stable is released.)
- [ ] Bootstrap 4 support. (When Bootstrap 4.0 final is released.)
- [ ] Tests and Travis-CI.
- [ ] Refactoring Datepicker.
- [ ] So many things....
See [Roadmap](https://github.com/yuche/vue-strap/issues/41)

## License
vue-strap is licensed under [The MIT License](LICENSE).

0 comments on commit bbe5299

Please sign in to comment.