Merge branch '2.3' into 2.4

app/Http/Controllers/Dashboard/ApiController.php

@@ -38,13 +38,13 @@ class ApiController extends AbstractApiController
         try {
             dispatch(new UpdateComponentCommand(
                 $component,
-                null,
-                null,
+                $component->name,
+                $component->description,
                 Binput::get('status'),
-                null,
-                null,
-                null,
-                null
+                $component->link,
+                $component->order,
+                $component->group_id,
+                $component->enabled
             ));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();
@@ -64,15 +64,17 @@ class ApiController extends AbstractApiController
 
         foreach ($componentData as $order => $componentId) {
             try {
+                $component = Component::find($componentId);
+
                 dispatch(new UpdateComponentCommand(
-                    Component::find($componentId),
-                    null,
-                    null,
-                    null,
-                    null,
+                    $component,
+                    $component->name,
+                    $component->description,
+                    $component->status,
+                    $component->link,
                     $order + 1,
-                    null,
-                    null
+                    $component->group_id,
+                    $component->enabled
                 ));
             } catch (QueryException $e) {
                 throw new BadRequestHttpException();
@@ -92,11 +94,13 @@ class ApiController extends AbstractApiController
         $groupData = Binput::get('ids');
 
         foreach ($groupData as $order => $groupId) {
+            $group = ComponentGroup::find($groupId);
+
             dispatch(new UpdateComponentGroupCommand(
-                ComponentGroup::find($groupId),
-                null,
+                $group,
+                $group->name,
                 $order + 1,
-                null
+                $group->collapsed
             ));
         }
 

composer.lock

@@ -325,16 +325,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.18.32",
+            "version": "3.18.33",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "84b9927ee116b30babf90a9fc723764672543e29"
+                "reference": "d787cfc514f77f5bee6990a466bc6922c0cf1526"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/84b9927ee116b30babf90a9fc723764672543e29",
-                "reference": "84b9927ee116b30babf90a9fc723764672543e29",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d787cfc514f77f5bee6990a466bc6922c0cf1526",
+                "reference": "d787cfc514f77f5bee6990a466bc6922c0cf1526",
                 "shasum": ""
             },
             "require": {
@@ -401,7 +401,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2016-07-21 22:30:58"
+            "time": "2016-07-26 18:19:04"
         },
         {
             "name": "backup-manager/backup-manager",

package.json

@@ -6,7 +6,7 @@
     "animate-sass": "git+https://github.com/tgdev/animate-sass.git",
     "autosize": "^3.0.15",
     "bootstrap-sass": "^3.3.6",
-    "chart.js": "^2.1.2",
+    "chart.js": "^2.2.0",
     "eonasdan-bootstrap-datetimepicker": "~3.1",
     "github-markdown-css": "^2.3.0",
     "ionicons": "~2.0",

public/build/rev-manifest.json

@@ -1,4 +1,4 @@
 {
-  "dist/css/all.css": "dist/css/all-81fdbf996d.css",
-  "dist/js/all.js": "dist/js/all-41ed801435.js"
+  "dist/css/all.css": "dist/css/all-fd273a4112.css",
+  "dist/js/all.js": "dist/js/all-6fcf335558.js"
 }

resources/lang/en/forms.php

@@ -23,6 +23,11 @@ return [
         'enable_google2fa' => 'Enable Google Two Factor Authentication',
         'cache_driver'     => 'Cache Driver',
         'session_driver'   => 'Session Driver',
+        'mail_driver'      => 'Mail Driver',
+        'mail_host'        => 'Mail Host',
+        'mail_address'     => 'Mail From Address',
+        'mail_username'    => 'Mail Username',
+        'mail_password'    => 'Mail Password',
     ],
 
     // Login form fields

resources/views/partials/metrics.blade.php

@@ -25,7 +25,7 @@
         </div>
         <div class="row">
             <div class="col-xs-12">
-                <canvas id="metric-{{ $metric->id }}" data-metric-name="{{ $metric->name }}" data-metric-suffix="{{ $metric->suffix }}" data-metric-id="{{ $metric->id }}" data-metric-group="{{ $metric->view_name }}" height="160" width="600"></canvas>
+                <canvas id="metric-{{ $metric->id }}" data-metric-name="{{ $metric->name }}" data-metric-suffix="{{ $metric->suffix }}" data-metric-id="{{ $metric->id }}" data-metric-group="{{ $metric->view_name }}" data-metric-precision="{{ $metric->places }}" height="160" width="600"></canvas>
             </div>
         </div>
     </li>
@@ -97,6 +97,7 @@
                             ticks: {
                                 beginAtZero: true,
                                 suggestedMax: 0.1,
+                                fixedStepSize: result.data.metric.places,
                                 callback: function(tickValue, index, ticks) {
                                     var delta = ticks[1] - ticks[0];