Skip to content

Commit e7a1bc7

Browse files
hawkeye64hawkeye64
committed
Merge branch 'dev'
2 parents 44256ad + 19089d8 commit e7a1bc7

30 files changed

+647
-664
lines changed

‎demo/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
"dependencies": {
1616
"@quasar/extras": "^1.1.4",
1717
"@quasar/quasar-app-extension-qiconpicker": "link:../.",
18-
"quasar": "^1.0.0-rc.5"
18+
"quasar": "^1.0.4"
1919
},
2020
"devDependencies": {
21-
"@quasar/app": "^1.0.0-rc.7",
22-
"@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.12",
21+
"@quasar/app": "^1.0.4",
22+
"@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.13",
2323
"@vue/eslint-config-standard": "^4.0.0",
24-
"babel-eslint": "^10.0.1",
25-
"eslint": "^5.16.0",
24+
"babel-eslint": "^10.0.2",
25+
"eslint": "^6.0.1",
2626
"eslint-loader": "^2.1.2",
27-
"eslint-plugin-vue": "^5.2.2",
27+
"eslint-plugin-vue": "^5.2.3",
2828
"quasar-app-extension-qribbon": "^1.0.0-alpha.3"
2929
},
3030
"engines": {

‎demo/yarn.lock‎

Lines changed: 519 additions & 536 deletions
Large diffs are not rendered by default.

‎docs/css/app.75ca5d69.css‎

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/css/app.791947e1.css‎

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

‎docs/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<!DOCTYPE html><html><head><title>Quasar App</title><meta charset=utf-8><meta name=description content="QIconPicker - A Quasar Framework app extension"><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png href=statics/app-logo-128x128.png><link rel=icon type=image/png sizes=16x16 href=statics/icons/favicon-16x16.png><link rel=icon type=image/png sizes=32x32 href=statics/icons/favicon-32x32.png><link rel=icon type=image/png sizes=96x96 href=statics/icons/favicon-96x96.png><link rel=icon type=image/ico href=statics/icons/favicon.ico><link href=/app-extension-qiconpicker/js/2d0a45dd.e6ec1077.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0b2d18.0d7aa3f2.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0b37e1.d67d0d86.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0c4663.dec999f2.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0c72f9.c2d1ef75.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0c8456.70a47602.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0cbe38.2ec64be5.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0d3144.9b920299.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0d5fdf.7793cafc.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0df247.b269f27d.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0e1fbf.0d82c201.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0e26a4.53c4f0ee.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d20881a.72cad64e.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d20ec35.72d83dc2.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d217c1d.e4bb85d1.js rel=prefetch><link href=/app-extension-qiconpicker/js/4b47640d.0143f3ac.js rel=prefetch><link href=/app-extension-qiconpicker/js/d99106a2.b16ff61d.js rel=prefetch><link href=/app-extension-qiconpicker/js/d9997f74.69a934ff.js rel=prefetch><link href=/app-extension-qiconpicker/css/app.791947e1.css rel=preload as=style><link href=/app-extension-qiconpicker/js/app.29552fad.js rel=preload as=script><link href=/app-extension-qiconpicker/js/runtime.ed03c97d.js rel=preload as=script><link href=/app-extension-qiconpicker/js/vendor.2e723d05.js rel=preload as=script><link href=/app-extension-qiconpicker/css/app.791947e1.css rel=stylesheet><base href=/app-extension-qiconpicker/ ></head><body><script>(function(){
1+
<!DOCTYPE html><html><head><title>Quasar App</title><meta charset=utf-8><meta name=description content="QIconPicker - A Quasar Framework app extension"><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png href=statics/app-logo-128x128.png><link rel=icon type=image/png sizes=16x16 href=statics/icons/favicon-16x16.png><link rel=icon type=image/png sizes=32x32 href=statics/icons/favicon-32x32.png><link rel=icon type=image/png sizes=96x96 href=statics/icons/favicon-96x96.png><link rel=icon type=image/ico href=statics/icons/favicon.ico><link href=/app-extension-qiconpicker/js/2d0a45dd.2da54d60.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0b2d18.933f7f70.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0b37e1.2cb96a41.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0c4663.9eb35db7.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0c72f9.000e17bd.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0c8456.a072862e.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0cbe38.f2808b29.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0d3144.f947b646.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0d5fdf.aff5cb1d.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0df247.28a129f4.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0e1fbf.f70b8adc.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d0e26a4.4f4bfd53.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d20881a.40434587.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d20ec35.d397b8b4.js rel=prefetch><link href=/app-extension-qiconpicker/js/2d217c1d.b4a5da85.js rel=prefetch><link href=/app-extension-qiconpicker/js/4b47640d.1adfa8e2.js rel=prefetch><link href=/app-extension-qiconpicker/js/d99106a2.6fcff903.js rel=prefetch><link href=/app-extension-qiconpicker/js/d9997f74.195dd3e4.js rel=prefetch><link href=/app-extension-qiconpicker/css/app.75ca5d69.css rel=preload as=style><link href=/app-extension-qiconpicker/js/app.c80e963e.js rel=preload as=script><link href=/app-extension-qiconpicker/js/runtime.82edfaae.js rel=preload as=script><link href=/app-extension-qiconpicker/js/vendor.9d0a7b34.js rel=preload as=script><link href=/app-extension-qiconpicker/css/app.75ca5d69.css rel=stylesheet><base href=/app-extension-qiconpicker/ ></head><body><script>(function(){
22
let redirect = sessionStorage.redirect;
33
delete sessionStorage.redirect;
44
if (redirect && redirect !== location.href) {
55
history.replaceState(null, null, redirect);
66
}
7-
})();</script><div id=q-app></div><script type=text/javascript src=/app-extension-qiconpicker/js/app.29552fad.js></script><script type=text/javascript src=/app-extension-qiconpicker/js/runtime.ed03c97d.js></script><script type=text/javascript src=/app-extension-qiconpicker/js/vendor.2e723d05.js></script></body></html>
7+
})();</script><div id=q-app></div><script type=text/javascript src=/app-extension-qiconpicker/js/app.c80e963e.js></script><script type=text/javascript src=/app-extension-qiconpicker/js/runtime.82edfaae.js></script><script type=text/javascript src=/app-extension-qiconpicker/js/vendor.9d0a7b34.js></script></body></html>

‎docs/js/2d0a45dd.e6ec1077.js‎ renamed to ‎docs/js/2d0a45dd.2da54d60.js‎

File renamed without changes.

‎docs/js/2d0b2d18.0d7aa3f2.js‎ renamed to ‎docs/js/2d0b2d18.933f7f70.js‎

File renamed without changes.

‎docs/js/2d0b37e1.d67d0d86.js‎ renamed to ‎docs/js/2d0b37e1.2cb96a41.js‎

File renamed without changes.

‎docs/js/2d0c4663.dec999f2.js‎ renamed to ‎docs/js/2d0c4663.9eb35db7.js‎

File renamed without changes.

‎docs/js/2d0c72f9.c2d1ef75.js‎ renamed to ‎docs/js/2d0c72f9.000e17bd.js‎

File renamed without changes.

0 commit comments

Comments
 (0)