snipe d8f0102204 Merge branch 'features/restore_deleted_cmd' into develop ...

# Conflicts:
#	config/version.php
#	resources/views/layouts/basic.blade.php

2018-07-27 02:48:13 -07:00

..

CreateAdmin.php

…

DisableLDAP.php

…

FixDoubleEscape.php

…

LdapSync.php

Check that the id key exists to prevent any weird edge cases for location

2018-03-05 22:44:05 -08:00

ObjectImportCommand.php

Change fire() to handle() for Laravel 5.5

2018-07-25 01:28:44 -07:00

PaveIt.php

Delete content from login attempts table

2018-07-26 18:08:25 -07:00

Purge.php

…

RecryptFromMcrypt.php

Fixed #3416 - bulk delete asset models

2017-12-12 09:10:05 -08:00

RegenerateAssetTags.php

…

ResetDemoSettings.php

Added footer settings to settings reset

2018-07-24 22:21:16 -07:00

RestoreDeletedUsers.php

Uncomment backup

2018-07-26 18:11:51 -07:00

SendExpectedCheckinAlerts.php

Change fire() to handle() for Laravel 5.5

2018-07-25 01:28:44 -07:00

SendExpirationAlerts.php

Change fire() to handle() for Laravel 5.5

2018-07-25 01:28:44 -07:00

SendInventoryAlerts.php

Features/nicer notifications (#5886)

2018-07-18 19:15:45 -07:00

SyncAssetCounters.php

Update withCounts because Laravel 5.5 :(

2018-07-24 22:40:05 -07:00

SyncAssetLocations.php

Cleaner re-implementation of loop-detection for asset-assigned-assets (#4553)

2017-12-04 23:00:55 -08:00

SystemBackup.php

Change fire() to handle() for Laravel 5.5

2018-07-25 01:28:44 -07:00

Version.php

…