snipe c3d55ee27e Merge master down into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Http/Transformers/AssetsTransformer.php # app/Models/Setting.php # config/version.php # resources/lang/af/button.php # resources/lang/ar/button.php # resources/lang/bg/button.php # resources/lang/cs/button.php # resources/lang/cy/button.php # resources/lang/da/button.php # resources/lang/de/button.php # resources/lang/el/button.php # resources/lang/en-GB/button.php # resources/lang/en-ID/button.php # resources/lang/es-CO/admin/groups/message.php # resources/lang/es-MX/button.php # resources/lang/et/admin/custom_fields/general.php # resources/lang/et/admin/hardware/table.php # resources/lang/et/admin/kits/general.php # resources/lang/et/admin/manufacturers/message.php # resources/lang/et/admin/models/general.php # resources/lang/et/admin/settings/general.php # resources/lang/et/button.php # resources/lang/et/mail.php # resources/lang/fa/button.php # resources/lang/fa/help.php # resources/lang/fi/button.php # resources/lang/fil/button.php # resources/lang/fr/button.php # resources/lang/ga-IE/button.php # resources/lang/he/button.php # resources/lang/hr/button.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/auth/message.php # resources/lang/hu/button.php # resources/lang/hu/mail.php # resources/lang/id/admin/hardware/table.php # resources/lang/id/button.php # resources/lang/it/button.php # resources/lang/iu/button.php # resources/lang/ja/button.php # resources/lang/ko/button.php # resources/lang/lt/button.php # resources/lang/lv/button.php # resources/lang/mi/button.php # resources/lang/mk/button.php # resources/lang/ml-IN/button.php # resources/lang/mn/button.php # resources/lang/ms/admin/hardware/table.php # resources/lang/ms/admin/kits/general.php # resources/lang/ms/admin/models/general.php # resources/lang/ms/admin/models/message.php # resources/lang/ms/admin/settings/general.php # resources/lang/ms/button.php # resources/lang/nl/button.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/auth/message.php # resources/lang/no/button.php # resources/lang/no/help.php # resources/lang/no/mail.php # resources/lang/pl/button.php # resources/lang/pt-BR/button.php # resources/lang/pt-PT/auth/message.php # resources/lang/pt-PT/button.php # resources/lang/pt-PT/mail.php # resources/lang/ro/button.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/help.php # resources/lang/sl/admin/custom_fields/general.php # resources/lang/sl/admin/hardware/table.php # resources/lang/sl/admin/kits/general.php # resources/lang/sl/admin/manufacturers/message.php # resources/lang/sl/admin/models/general.php # resources/lang/sl/admin/settings/general.php # resources/lang/sl/admin/users/general.php # resources/lang/sl/auth/message.php # resources/lang/sl/button.php # resources/lang/sl/help.php # resources/lang/sr-CS/button.php # resources/lang/ta/button.php # resources/lang/th/button.php # resources/lang/th/mail.php # resources/lang/tl/button.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/auth/message.php # resources/lang/tr/button.php # resources/lang/uk/button.php # resources/lang/ur-PK/button.php # resources/lang/vi/button.php # resources/lang/zh-CN/button.php # resources/lang/zh-HK/button.php # resources/lang/zh-TW/admin/hardware/table.php # resources/lang/zh-TW/button.php # resources/lang/zu/button.php # resources/views/models/custom_fields_form.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/slack.blade.php		2021-12-16 14:26:24 -08:00
..
Accessories	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
Account	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Api	Merge master down into develop	2021-12-16 14:26:24 -08:00
Assets	Applied escaping fix from master to develop	2021-11-24 19:38:27 -08:00
Auth	support apache REDIRECT_* for remote user login	2021-10-28 14:23:38 -04:00
Components	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
Consumables	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
Kits	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Licenses	Fixed duplicate use statement from merge fuckery	2021-10-20 17:54:32 -07:00
Users	Add a variable to better control the selected user's ids	2021-12-11 18:01:38 -06:00
ActionlogController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
AssetMaintenancesController.php	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
AssetModelsController.php	Merge master down into develop	2021-12-16 14:26:24 -08:00
BulkAssetModelsController.php	Adds reqestable as model bulk edit field	2021-10-28 15:15:54 -07:00
CategoriesController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
CheckInOutRequest.php	when parent asset is assigned to other location, children assets location are updated as well.	2021-10-20 17:01:25 -07:00
CompaniesController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Controller.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
CustomFieldsController.php	Merge master down into develop	2021-12-16 14:26:24 -08:00
CustomFieldsetsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
DashboardController.php	Added additional boxes to the dashboard	2021-06-28 16:36:15 -07:00
DepartmentsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
DepreciationsController.php	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
GroupsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
HealthController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ImportsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
LocationsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ManufacturersController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ModalController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ProfileController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ReportsController.php	Add title column to custom reports	2021-12-14 12:05:33 -06:00
SettingsController.php	Merge master down into develop	2021-12-16 14:26:24 -08:00
StatuslabelsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
SuppliersController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ViewAssetsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00