snipe 43c57c8461 Merge master into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Http/Controllers/BulkAssetModelsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ModalController.php # app/Http/Transformers/GroupsTransformer.php # config/version.php # package-lock.json # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/assets/less/overrides.less # resources/lang/en/admin/hardware/message.php # resources/lang/en/admin/settings/general.php # resources/views/partials/bootstrap-table.blade.php # routes/web.php		2022-01-12 20:51:33 -08:00
..
accessories	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
asset_maintenances	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
categories	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
companies	Added localized strings for admin/companies	2021-11-02 10:23:15 +01:00
components	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
consumables	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
custom_fields	Added localized strings for custom_fields	2021-11-02 11:27:53 +01:00
departments	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
depreciations	Added localized strings for reports	2021-11-19 12:39:19 +01:00
groups	Added localized strings for groups	2021-11-02 12:03:41 +01:00
hardware	Merge master into develop	2022-01-12 20:51:33 -08:00
importer	Adding newly added template files	2021-11-04 20:12:47 +01:00
kits	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00
licenses	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
locations	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00
manufacturers	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
models	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
reports	fix rebase errors	2021-10-07 21:32:57 +02:00
settings	Merge master into develop	2022-01-12 20:51:33 -08:00
statuslabels	Updated more fa icons	2021-09-26 01:11:08 -07:00
suppliers	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
users	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00