1
0
Fork 0

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-10-20 18:44:16 +02:00
commit c25f4e5420
4 changed files with 64 additions and 2 deletions

View File

@ -131,6 +131,11 @@
* https://github.com/hapijs/joi
* BSD 3-Clause License
#### Ace
* https://github.com/ajaxorg/ace
* BSD 3-Clause License
#### YAML
* https://github.com/nodeca/js-yaml
@ -208,8 +213,9 @@
* http://www.embeddedjs.com
* MIT License
#### Handlebars
#### jq-console
* https://github.com/replit/jq-console
* MIT License
#### Highlight.js
@ -226,6 +232,51 @@
* http://jquery.com
* MIT License
#### jQuery UI
* http://jqueryui.com
* MIT License
#### jQuery Snippet
* http://steamdev.com/snippet
* MIT License
#### jQuery Hotkeys
* https://github.com/jeresig/jquery.hotkeys
* MIT License or GPL Version 2 License
#### jQuery Contextmenu
* https://github.com/swisnl/jQuery-contextMenu
* MIT License
#### jQuery Form
* https://github.com/malsup/form/
* MIT License or GPL Version 2 License
#### jQuery UploadFile
* https://github.com/hayageek/jquery-upload-file/
* MIT License
#### jQuery Textfill
* https://github.com/jquery-textfill/jquery-textfill
* MIT License
#### jQuery Strftime
* https://github.com/samsonjs/strftime
* MIT License
#### nvd3
* https://github.com/novus/nvd3
* Apache 2 License
#### jsoneditor.js
* Apache 2 License

View File

@ -136,6 +136,17 @@
ext: '.html.gz'
}]
},
clusterHTML: {
options: {
mode: 'gzip'
},
files: [{
expand: true,
src: ['clusterFrontend/build/*min*.html'],
dest: '.',
ext: '.html.gz'
}]
},
standaloneCSS: {
options: {
mode: 'gzip'

View File

@ -41,7 +41,7 @@
},
"/cluster.html": {
"path": "clusterFrontend/build/cluster-min.html",
"gzip": false
"gzip": true
},
"/css/sass.css": {
"path": "frontend/build/style-minified.css",