Merge remote-tracking branch 'origin/develop'

Author: snipe

config/backup.php

@@ -121,12 +121,12 @@
     'notifications' => [
 
         'notifications' => [
-            \Spatie\Backup\Notifications\Notifications\BackupHasFailed::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
-            \Spatie\Backup\Notifications\Notifications\UnhealthyBackupWasFound::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
-            \Spatie\Backup\Notifications\Notifications\CleanupHasFailed::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
-            \Spatie\Backup\Notifications\Notifications\BackupWasSuccessful::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
-            \Spatie\Backup\Notifications\Notifications\HealthyBackupWasFound::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
-            \Spatie\Backup\Notifications\Notifications\CleanupWasSuccessful::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
+            \Spatie\Backup\Notifications\Notifications\BackupHasFailedNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
+            \Spatie\Backup\Notifications\Notifications\UnhealthyBackupWasFoundNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
+            \Spatie\Backup\Notifications\Notifications\CleanupHasFailedNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
+            \Spatie\Backup\Notifications\Notifications\BackupWasSuccessfulNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
+            \Spatie\Backup\Notifications\Notifications\HealthyBackupWasFoundNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
+            \Spatie\Backup\Notifications\Notifications\CleanupWasSuccessfulNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
         ],
 
         /*

resources/views/dashboard.blade.php

@@ -473,7 +473,7 @@ class="table table-striped snipe-table"
             </div><!-- /.box-body -->
         </div> <!-- /.box -->
     </div>
-</div>
+
 
 @endif
 

resources/views/settings/api.blade.php

@@ -17,7 +17,7 @@
             <livewire:oauth-clients />
         </div>
     @else
-        <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+        <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
     @endif
 
 @stop

resources/views/settings/backups.blade.php

@@ -194,8 +194,7 @@ class="btn btn-warning btn-sm restore-asset {{ (config('app.lock_passwords')) ?
         </div> <!-- end col-md-12 form div -->
    </div> <!-- end form group div -->
 
-  </div> <!-- end col-md-3 div -->
-</div> <!-- end row div -->
+
 
 @stop
 

resources/views/settings/general.blade.php

@@ -390,7 +390,7 @@
 
         </div> <!-- /box -->
     </div> <!-- /.col-md-8-->
-    </div> <!-- /.row-->
+
 
     {{ Form::close() }}