Merge branch '2.4' of github.com:CachetHQ/Cachet into 2.4

resources/views/dashboard/settings/app-setup.blade.php

@@ -49,6 +49,14 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="row">
+                            <div class="col-xs-12">
+                                <div class="form-group">
+                                    <label>{{ trans('forms.settings.app-setup.time_before_refresh') }}</label>
+                                    <input type="number" name="app_refresh_rate" class="form-control" value="{{ Config::get('setting.app_refresh_rate', 0) }}" placeholder="{{ trans('forms.settings.app-setup.time_before_refresh') }}">
+                                </div>
+                            </div>
+                        </div>
                         <div class="row">
                             <div class="col-xs-12">
                                 <div class="checkbox">

resources/views/layout/master.blade.php

@@ -63,6 +63,17 @@
 
     <script type="text/javascript">
         var Global = {};
+
+        var refreshRate = parseInt("{{ $app_refresh_rate }}");
+
+        function refresh() {
+                window.location.reload(true);
+        }
+
+        if(refreshRate > 0) {
+                setTimeout(refresh, refreshRate * 1000);
+        }
+
         Global.locale = '{{ $app_locale }}';
     </script>
     <script src="{{ mix('dist/js/all.js') }}"></script>

resources/views/setup/index.blade.php

@@ -212,6 +212,7 @@
                 <hr >
                 <div class="form-group text-center">
                     <input type="hidden" name="settings[app_incident_days]" value="7" >
+                    <input type="hidden" name="settings[app_refresh_rate]" value="0" >
                     <span class="wizard-next btn btn-info" data-current-block="3" data-next-block="2">
                         {{ trans('pagination.previous') }}
                     </span>