Commit 0b965ef1 authored by Maxime Chazalviel's avatar Maxime Chazalviel

Merge branch 'master' into feature/flux

# Conflicts:
#	resources/lib/functions/GraphNetwork.js
#	resources/lib/functions/GraphUtils.js
parents 2ef02e31 73c65a3f

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
* The application's namespace. * The application's namespace.
*/ */
"name": "metExploreViz", "name": "metExploreViz",
/** /**
* The version of the application. * The version of the application.
*/ */
"version": "2.6.5", "version": "2.6.13",
/** /**
* The relative path to the application's markup file (html, jsp, asp, etc.). * The relative path to the application's markup file (html, jsp, asp, etc.).
...@@ -41,22 +41,22 @@ ...@@ -41,22 +41,22 @@
* The Sencha Framework for this application: "ext" or "touch". * The Sencha Framework for this application: "ext" or "touch".
*/ */
"framework": "ext", "framework": "ext",
/** /**
* The toolkit to use. Select either "classic" or "modern". * The toolkit to use. Select either "classic" or "modern".
*/ */
"toolkit": "classic", "toolkit": "classic",
/** /**
* The name of the theme for this application. * The name of the theme for this application.
*/ */
"theme": "theme-triton", "theme": "theme-triton",
/** /**
* The list of required packages (with optional versions; default is "latest"). * The list of required packages (with optional versions; default is "latest").
* *
...@@ -103,9 +103,9 @@ ...@@ -103,9 +103,9 @@
* "save": "sass/save.scss" * "save": "sass/save.scss"
* *
*/ */
// "save": "sass/save.scss", // "save": "sass/save.scss",
/** /**
* Comma-separated list of files or folders containing extra Sass. These * Comma-separated list of files or folders containing extra Sass. These
* files are automatically included in the Sass compilation. By default this * files are automatically included in the Sass compilation. By default this
...@@ -342,18 +342,18 @@ ...@@ -342,18 +342,18 @@
"bundle": true "bundle": true
}, },
{ {
"path": "resources/lib/functions/GraphPanel.js", "path": "resources/lib/functions/GraphPanel.js",
"bundle": true "bundle": true
}, },
{ {
"path": "resources/lib/functions/GraphPath.js", "path": "resources/lib/functions/GraphPath.js",
"bundle": true "bundle": true
}, },
{ {
"path": "resources/lib/functions/GraphStyleEdition.js", "path": "resources/lib/functions/GraphStyleEdition.js",
"bundle": true "bundle": true
} }
], ],
...@@ -430,21 +430,21 @@ ...@@ -430,21 +430,21 @@
* are supported. * are supported.
* *
*/ */
"loader": { "loader": {
// This property controls how the loader manages caching for requests: // This property controls how the loader manages caching for requests:
// //
// - true: allows requests to receive cached responses // - true: allows requests to receive cached responses
// - false: disable cached responses by adding a random "cache buster" // - false: disable cached responses by adding a random "cache buster"
// - other: a string (such as the build.timestamp shown here) to allow // - other: a string (such as the build.timestamp shown here) to allow
// requests to be cached for this build. // requests to be cached for this build.
// //
"cache": false, "cache": false,
// When "cache" is not true, this value is the request parameter used // When "cache" is not true, this value is the request parameter used
// to control caching. // to control caching.
// //
"cacheParam": "_dc" "cacheParam": "_dc"
}, },
/** /**
* Settings specific to production builds. * Settings specific to production builds.
...@@ -466,13 +466,13 @@ ...@@ -466,13 +466,13 @@
"type": "yui" "type": "yui"
} }
}, },
/** /**
* Settings specific to testing builds. * Settings specific to testing builds.
*/ */
"testing": { "testing": {
}, },
/** /**
* Settings specific to development builds. * Settings specific to development builds.
*/ */
...@@ -515,7 +515,7 @@ ...@@ -515,7 +515,7 @@
*/ */
"bootstrap": { "bootstrap": {
"base": "${app.dir}", "base": "${app.dir}",
"microloader": "bootstrap.js", "microloader": "bootstrap.js",
"css": "bootstrap.css" "css": "bootstrap.css"
}, },
...@@ -560,7 +560,7 @@ ...@@ -560,7 +560,7 @@
* } * }
* *
*/ */
"output": { "output": {
"base": "${workspace.build.dir}/${build.environment}/${app.name}", "base": "${workspace.build.dir}/${build.environment}/${app.name}",
"appCache": { "appCache": {
...@@ -572,8 +572,8 @@ ...@@ -572,8 +572,8 @@
"enable": true "enable": true
} }