Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisMazel committed Sep 21, 2018
2 parents d08558c + 4945de7 commit dccb963
Show file tree
Hide file tree
Showing 23 changed files with 34 additions and 1,808 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ Vue.component('vue-ctk-date-time-picker', VueCtkDateTimePicker);
| disable-date | Boolean | no | false |
| without-header | Boolean | no | false |
| id | string | no | CtkDateTimePicker |
| overlay | Boolean | no | true |
| enable-button-validate | Boolean | no | false |
| min-date**** | string | no | - |
| max-date**** | string | no | - |
Expand Down
2 changes: 1 addition & 1 deletion demo/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>vue-ctk-date-time-picker</title><link rel=stylesheet href=./assets/main.css><link href=./static/css/app.e06b72e2fbf158d6e5510e7a529723e2.css rel=stylesheet></head><body><div id=app></div><script src=/build/build.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.88b4d2f1b6949b36de49.js></script><script type=text/javascript src=./static/js/app.b92df41e8cac0b017c12.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>vue-ctk-date-time-picker</title><link rel=stylesheet href=./assets/main.css><link href=./static/css/app.9af8a84b7b85a6d85110eff781f7d9be.css rel=stylesheet></head><body><div id=app></div><script src=/build/build.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.88b4d2f1b6949b36de49.js></script><script type=text/javascript src=./static/js/app.572d21958a970c39c4f2.js></script></body></html>
2 changes: 2 additions & 0 deletions demo/static/css/app.9af8a84b7b85a6d85110eff781f7d9be.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions demo/static/css/app.e06b72e2fbf158d6e5510e7a529723e2.css

This file was deleted.

This file was deleted.

2 changes: 2 additions & 0 deletions demo/static/js/app.572d21958a970c39c4f2.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions demo/static/js/app.572d21958a970c39c4f2.js.map

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions demo/static/js/app.b92df41e8cac0b017c12.js

This file was deleted.

1 change: 0 additions & 1 deletion demo/static/js/app.b92df41e8cac0b017c12.js.map

This file was deleted.

2 changes: 1 addition & 1 deletion demo/static/js/manifest.3ad1d5771e9b13dbdad2.js.map

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

2 changes: 1 addition & 1 deletion dist/umd/vue-ctk-date-time-picker.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/umd/vue-ctk-date-time-picker.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/umd/vue-ctk-date-time-picker.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/umd/vue-ctk-date-time-picker.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-ctk-date-time-picker.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-ctk-date-time-picker.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-ctk-date-time-picker.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-ctk-date-time-picker.min.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit dccb963

Please sign in to comment.