Merge branch 'dev'

cheton · Apr 12, 2016 · 37ab185 · 37ab185
2 parents 4527a2e + f6996cc
commit 37ab185
Show file tree

Hide file tree

Showing 86 changed files with 1,121 additions and 9,160 deletions.
diff --git a/app/app.multihost.js b/app/app.multihost.js
@@ -136,7 +136,7 @@ module.exports = function() {
         error: 'Not found'
     }));
     app.use(middleware.err_server({
-        view: path.join('common', '500.jade'),
+        view: path.join('common', '500.hogan'),
         error: 'Internal server error'
     }));
 

diff --git a/app/app.standalone.js b/app/app.standalone.js
@@ -155,7 +155,7 @@ module.exports = function() {
         error: 'Not found'
     }));
     app.use(middleware.err_server({
-        view: path.join('common', '500.jade'),
+        view: path.join('common', '500.hogan'),
         error: 'Internal server error'
     }));
 

diff --git a/app/config/settings.js b/app/config/settings.js
@@ -83,10 +83,6 @@ var settings = { // Default settings
             { // Hogan template with .hogan extension
                 extension: 'hogan',
                 template: 'hogan'
-            },
-            { // Jade template with .jade extension
-                extension: 'jade',
-                template: 'jade'
             }
         ]
     },

diff --git a/app/test/lib/middleware/err.js b/app/test/lib/middleware/err.js
@@ -64,7 +64,7 @@ module.exports.err = {
         }));
 
         app.use(err_server({
-            view: 'common/500.jade'
+            view: 'common/500.hogan'
         }));
 
         this.app = app;

diff --git a/app/views/common/500.hogan b/app/views/common/500.hogan
@@ -0,0 +1,16 @@
+<!--[if IE]><![endif]-->
+<!DOCTYPE html>
+<!--[if IE 9]>         <html dir="{{dir}}" lang="{{lang}}" class="no-js ie9"> <![endif]-->
+<!--[if gt IE 9]><!--> <html dir="{{dir}}" lang="{{lang}}" class="no-js"> <!--<![endif]-->
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<title>Error</title>
+<meta name="description" content="">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<body>
+<h1>An error occurred!</h1>
+<h1>Error: {{error.message}}</h1>
+</body>
+</html>
diff --git a/app/views/common/500.jade b/app/views/common/500.jade
diff --git a/app/views/common/error.jade b/app/views/common/error.jade
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "webappengine",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "A web application platform that can host multiple web apps running with Node.js.",
   "ignore": [],
   "dependencies": {
@@ -18,8 +18,7 @@
     "async": "~1.4.2",
     "jsUri": "~1.3.1",
     "i18next": "~1.10.2",
-    "ionicons": "~2.0.1",
-    "Sortable": "~1.2.1"
+    "ionicons": "~2.0.1"
   },
   "overrides": {
     "bootstrap": {

diff --git a/bower_components/Sortable/.bower.json b/bower_components/Sortable/.bower.json
diff --git a/bower_components/Sortable/.editorconfig b/bower_components/Sortable/.editorconfig
diff --git a/bower_components/Sortable/.gitignore b/bower_components/Sortable/.gitignore
diff --git a/bower_components/Sortable/.jshintrc b/bower_components/Sortable/.jshintrc
diff --git a/bower_components/Sortable/CONTRIBUTING.md b/bower_components/Sortable/CONTRIBUTING.md
diff --git a/bower_components/Sortable/Gruntfile.js b/bower_components/Sortable/Gruntfile.js