snipe 533649f24e Merge branch 'develop' into dev-master-integration ... # Conflicts: # .gitignore # .travis.yml # app/Console/Commands/LdapSync.php # app/Console/Commands/SendExpectedCheckinAlerts.php # app/Console/Commands/SendExpirationAlerts.php # app/Console/Commands/SendInventoryAlerts.php # app/Console/Kernel.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/ManufacturersController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/Auth/ResetPasswordController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/UsersController.php # app/Http/Transformers/AssetMaintenancesTransformer.php # app/Importer/Importer.php # app/Importer/ItemImporter.php # app/Importer/UserImporter.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/License.php # app/Models/Location.php # app/Models/Recipients/AlertRecipient.php # app/Models/User.php # app/Providers/AppServiceProvider.php # composer.json # composer.lock # config/trustedproxy.php # config/version.php # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue # resources/lang/ar/admin/settings/general.php # resources/lang/bg/admin/settings/general.php # resources/lang/en-ID/admin/settings/general.php # resources/lang/en-ID/passwords.php # resources/lang/en/passwords.php # resources/lang/es-CO/passwords.php # resources/lang/es-ES/passwords.php # resources/lang/es-MX/passwords.php # resources/lang/es-VE/passwords.php # resources/lang/fi/admin/settings/general.php # resources/lang/id/admin/settings/general.php # resources/lang/id/passwords.php # resources/lang/ja/passwords.php # resources/lang/nl/passwords.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/passwords.php # resources/lang/pt-BR/admin/settings/general.php # resources/lang/pt-BR/passwords.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/admin/statuslabels/table.php # resources/lang/ru/passwords.php # resources/lang/sr-CS/general.php # resources/lang/sr-CS/mail.php # resources/lang/sv-SE/admin/settings/general.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/passwords.php # resources/lang/vi/admin/models/message.php # resources/lang/vi/admin/users/general.php # resources/lang/zh-CN/admin/settings/general.php # resources/views/importer/import.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/image-upload.blade.php # resources/views/users/edit.blade.php # resources/views/users/view.blade.php # tests/unit/ImporterTest.php		2019-02-13 06:42:52 -08:00
..
Recipients	Fixed #5965: Allow multiple alert email addresses (#6233)	2018-09-26 14:07:41 -07:00
Traits	Adding some comments	2018-08-06 14:47:26 +02:00
Accessory.php	[WIP] Added #5957 - Flysystem support (#6262)	2018-09-29 21:33:52 -07:00
Actionlog.php	Improvement: Better documentation, small refactors (#6017)	2018-08-01 00:06:41 -07:00
Asset.php	Replaced custom deleted query scopes with onlyTrashed()	2019-01-24 14:47:44 -08:00
AssetMaintenance.php	Merge branch 'develop' into dev-master-integration	2019-02-13 06:42:52 -08:00
AssetModel.php	Replaced custom deleted query scopes with onlyTrashed()	2019-01-24 14:47:44 -08:00
Category.php	Improvement: Better documentation, small refactors (#6017)	2018-08-01 00:06:41 -07:00
CheckoutAcceptance.php	Adding some comments	2018-08-06 14:47:26 +02:00
CheckoutRequest.php	WIP - Improved requested assets (#5289)	2018-04-04 17:33:02 -07:00
Company.php	Refactoring: A nicer and easier syntax for searching models (#5841)	2018-07-16 14:13:07 -07:00
CompanyableChildScope.php	Updated docblocks	2016-04-07 13:21:09 -07:00
CompanyableChildTrait.php	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
CompanyableScope.php	Updated docblocks	2016-04-07 13:21:09 -07:00
CompanyableTrait.php	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
Component.php	Cleanup of model attributes	2018-08-06 14:46:10 +02:00
Consumable.php	Allow 0 as a consumable min amt	2018-10-15 17:04:51 -07:00
ConsumableAssignment.php	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
CustomField.php	Fixed: #5896 Custom fields of type "CUSTOM REGEX" are always saved as "ANY" (#6381)	2018-12-06 20:05:04 -08:00
CustomFieldset.php	Make CustomFieldset rules public instead of protected	2018-09-28 15:18:23 -07:00
Department.php	Port import manager code to develop	2018-10-03 00:52:29 -07:00
Depreciable.php	Added: Caching of settings (#6378)	2018-11-01 19:59:50 -07:00
Depreciation.php	Improvement: Better documentation, small refactors (#6017)	2018-08-01 00:06:41 -07:00
Group.php	Improvement: Better documentation, small refactors (#6017)	2018-08-01 00:06:41 -07:00
ICompanyableChild.php	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
Import.php	Importer mapping - v1 (#3677)	2017-06-21 16:37:37 -07:00
License.php	Fixed #6386 - licenses not searching on category name	2018-11-02 17:15:04 -07:00
LicenseSeat.php	#5696 proposed fix (#6314)	2018-10-11 14:08:09 -07:00
Location.php	Merge branch 'develop' into dev-master-integration	2019-02-13 06:42:52 -08:00
Loggable.php	Merge branch 'develop' into dev-master-integration	2019-02-13 06:42:52 -08:00
Manufacturer.php	Improvement: Better documentation, small refactors (#6017)	2018-08-01 00:06:41 -07:00
Requestable.php	WIP - Improved requested assets (#5289)	2018-04-04 17:33:02 -07:00
Setting.php	Simplify slack channel regexp and allow private (no # prefix) channels and direct messages (@ prefix) (#6699)	2019-02-08 15:41:54 -08:00
SnipeModel.php	Feature: PostgreSQL support (#5642)	2018-07-12 18:24:43 -07:00
Statuslabel.php	Improvement: Better documentation, small refactors (#6017)	2018-08-01 00:06:41 -07:00
Supplier.php	Improvement: Better documentation, small refactors (#6017)	2018-08-01 00:06:41 -07:00
User.php	Make user notes field editable via API	2019-02-13 01:32:00 -08:00