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	Add additional info on accessories view page	2021-09-26 03:59:04 -07:00
account	Fixed labels in profile form	2021-10-28 12:57:27 -07:00
asset_maintenances	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
auth	First steps at getting dusk working	2021-11-30 20:09:29 -08:00
categories	Merge master down into develop	2021-12-16 14:26:24 -08:00
companies	Updated more fa icons	2021-09-26 01:11:08 -07:00
components	Delete extra character remaining from previous tests :(	2021-12-14 12:32:30 -06:00
consumables	Use Helper alias	2021-09-28 19:44:55 -07:00
custom_fields	Merge remote-tracking branch 'origin/master' into develop	2021-11-15 19:24:38 -08:00
departments	Add a hidden field to handle departments inside Full Company Support config	2021-07-29 13:28:57 -05:00
depreciations	Use Helper alias	2021-09-28 19:44:55 -07:00
errors	More fa icons	2021-09-24 07:21:30 -07:00
groups	Updated more fa icons	2021-09-26 01:11:08 -07:00
hardware	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
importer	Updated more fa icons	2021-09-26 01:11:08 -07:00
kits	Updated more fa icons	2021-09-26 01:11:08 -07:00
layouts	Merge master down into develop	2021-12-16 14:26:24 -08:00
licenses	UNRELATED: fixed wrong html tag for license view badge count	2021-11-10 00:08:15 -08:00
livewire	Possible fix for asset model editing when no custom fieldset is associated	2021-11-15 21:09:35 -08:00
locations	Use Helper alias	2021-09-28 19:44:55 -07:00
manufacturers	Updated more fa icons	2021-09-26 01:11:08 -07:00
modals	Merge master down into develop	2021-12-16 14:26:24 -08:00
models	Add the call to defaultValue() function in custom fields with date format	2021-11-23 17:21:46 -06:00
notifications	Use Helper alias	2021-09-28 19:44:55 -07:00
paginator	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
partials	Merge master down into develop	2021-12-16 14:26:24 -08:00
reports	Merge master down into develop	2021-12-16 14:26:24 -08:00
settings	Merge master down into develop	2021-12-16 14:26:24 -08:00
setup	Use Helper alias	2021-09-28 19:44:55 -07:00
statuslabels	Updated more fa icons	2021-09-26 01:11:08 -07:00
suppliers	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
users	Adds reqestable as model bulk edit field	2021-10-28 15:15:54 -07:00
vendor	Fixes a couple blade templates for relative URLs (#9170)	2021-02-26 15:59:36 -08:00
dashboard.blade.php	Merge branch 'develop' into bug/sc-17129/v6-integration-pie-chart-disappears-if-you	2021-10-28 17:13:37 -07:00
notifications.blade.php	Updated more fa icons	2021-09-26 01:11:08 -07:00