Merge branch 'dev' into native-export
Conflicts: ui/doc.js
Showing
No preview for this file type
lib/canvg-1.3/StackBlur.js
0 → 100755
lib/canvg-1.3/canvg.js
0 → 100755
This source diff could not be displayed because it is too large. You can view the blob instead.
lib/canvg-1.3/rgbcolor.js
0 → 100755
lib/qrcode.js
0 → 100644
lib/source-map.min.js
0 → 100644
... | ... | @@ -2,7 +2,7 @@ |
"name": "kityminder", | ||
"title": "kityminder", | ||
"description": "Kity Minder", | ||
"version": "1.3.0", | ||
"version": "1.3.1", | ||
"homepage": "https://github.com/fex-team/kityminder", | ||
"author": { | ||
"name": "f-cube @ FEX", | ||
... | ... | @@ -30,13 +30,14 @@ |
"dependencies": {}, | ||
"devDependencies": { | ||
"grunt": "~0.4.1", | ||
"grunt-contrib-concat": "~0.3.0", | ||
"grunt-contrib-uglify": "~0.2.6", | ||
"grunt-contrib-concat": "~0.5.0", | ||
"grunt-contrib-uglify": "~0.4.0", | ||
"grunt-contrib-copy": "~0.5.0", | ||
"grunt-text-replace": "~0.3.9", | ||
"grunt-contrib-watch": "~0.6.1", | ||
"grunt-contrib-less": "~0.11.3", | ||
"grunt-contrib-clean": "~0.6.0" | ||
"grunt-contrib-clean": "~0.6.0", | ||
"grunt-autoprefixer": "~1.0.1" | ||
} | ||
} | ||
\ No newline at end of file |
static/pages/feedback.html
0 → 100644
ui/menu/help/feedback.js
0 → 100644
ui/ribbon/view/fullscreen.js
0 → 100644
22.9 KB
1.38 KB
541 Bytes
ui/topbar/feedback.js
0 → 100644
ui/widget/notice.js
0 → 100644