Merge branch 'develop'

# Conflicts:
#	config/version.php

Author: snipe

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v4.1.10-pre',
-  'full_app_version' => 'v4.1.10-pre - build 3244-g798ea75',
-  'build_version' => '3244',
+  'app_version' => 'v4.1.10',
+  'full_app_version' => 'v4.1.10 - build 3249-g8d3a214',
+  'build_version' => '3249',
   'prerelease_version' => '',
-  'hash_version' => 'g798ea75',
-  'full_hash' => 'v4.1.10-pre-114-g798ea75',
+  'hash_version' => 'g8d3a214',
+  'full_hash' => 'v4.1.10-119-g8d3a214',
   'branch' => 'master',
 );

public/css/app.css

@@ -1,14 +1,14 @@
 {
-    "/js/build/vue.js": "/js/build/vue.js?id=7de68d09c5faff74d7b7",
+    "/js/build/vue.js": "/js/build/vue.js?id=25049a0c0eb736e1c883",
     "/css/AdminLTE.css": "/css/AdminLTE.css?id=b8be19a285eaf44eec37",
-    "/css/app.css": "/css/app.css?id=c9a81f09fdea13a28c54",
+    "/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
     "/css/overrides.css": "/css/overrides.css?id=1bdafb06a8609780f546",
-    "/js/build/vue.js.map": "/js/build/vue.js.map?id=acc97065a23ea72f47ad",
+    "/js/build/vue.js.map": "/js/build/vue.js.map?id=6b79d08f1decca72957c",
     "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=99f5a5a03c4155cf69f6",
     "/css/app.css.map": "/css/app.css.map?id=bdbe05e6ecd70ccfac72",
     "/css/overrides.css.map": "/css/overrides.css.map?id=898c91d4a425b01b589b",
     "/css/dist/all.css": "/css/dist/all.css?id=3a8aa974e7b09b52b18c",
-    "/js/dist/all.js": "/js/dist/all.js?id=1528aeec676d855a2ecd",
+    "/js/dist/all.js": "/js/dist/all.js?id=722d1692756a30dc1ece",
     "/css/build/all.css": "/css/build/all.css?id=3a8aa974e7b09b52b18c",
-    "/js/build/all.js": "/js/build/all.js?id=1528aeec676d855a2ecd"
+    "/js/build/all.js": "/js/build/all.js?id=722d1692756a30dc1ece"
 }

public/js/build/all.js

@@ -56,14 +56,12 @@
 
         data: $('.modal-body form').serialize(),
         success: function (result) {
-            console.dir(result);
 
             if(result.status == "error") {
                 var error_message="";
                 for(var field in result.messages) {
                     error_message += "<li>Problem(s) with field <i><strong>" + field + "</strong></i>: " + result.messages[field];
-                    console.dir(result.messages);
-                    console.log('error_messages are: ' + error_message);
+
                 }
                 $('#modal_error_msg').html(error_message).show();
                 return false;
@@ -81,14 +79,11 @@
             // clicked 'add' on to add a new 'thing'
             // this code adds the newly created object to that select
             var selector = document.getElementById(select);
-            console.warn("The selector we should've selecte dis: "+select);
-            console.dir(selector);
+
             if(!selector) {
                 return false;
             }
 
-            console.warn("onChange Selector Thing should've activated? Here's the selector");
-            console.dir(selector);
             selector.options[selector.length] = new Option(name, id);
             selector.selectedIndex = selector.length - 1;
             $(selector).trigger("change");