snipe 9aac1cbba4 Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/MoveUploadsToNewDisk.php # app/Http/Controllers/ActionlogController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Assets/AssetCheckinController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/BulkUsersController.php # app/Http/Requests/AssetCheckoutRequest.php # app/Importer/LicenseImporter.php # app/Models/Actionlog.php # app/Models/License.php # app/Models/User.php # app/Observers/AssetObserver.php # composer.lock # config/version.php # database/factories/LicenseFactory.php # database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php # database/migrations/2018_10_18_191228_add_kits_licenses_table.php # database/migrations/2018_10_19_153910_add_kits_table.php # database/migrations/2018_10_19_154013_add_kits_models_table.php # database/migrations/2019_02_07_185953_add_kits_consumables_table.php # database/migrations/2019_02_07_190030_add_kits_accessories_table.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/ar/general.php # resources/lang/ar/passwords.php # resources/lang/cs/general.php # resources/lang/cs/passwords.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/fr/admin/custom_fields/general.php # resources/lang/fr/admin/hardware/general.php # resources/lang/fr/admin/locations/table.php # resources/lang/fr/admin/settings/message.php # resources/lang/hu/admin/custom_fields/general.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/general.php # resources/lang/it/admin/settings/general.php # resources/lang/nl/admin/custom_fields/general.php # resources/lang/nl/admin/settings/general.php # resources/lang/nl/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/sv-SE/passwords.php # resources/lang/tr/general.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/reports/activity.blade.php # resources/views/users/print.blade.php		2022-04-28 17:49:06 +01:00
..
Accessories	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Account	clean up	2022-03-22 10:07:08 -07:00
Api	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8	2022-04-28 17:49:06 +01:00
Assets	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8	2022-04-28 17:49:06 +01:00
Auth	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Components	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Consumables	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08: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	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8	2022-04-28 17:49:06 +01:00
Users	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8	2022-04-28 17:49:06 +01:00
ActionlogController.php	Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf	2022-03-22 10:10:56 -07:00
AssetMaintenancesController.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
AssetModelsController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
BulkAssetModelsController.php	Merge master into develop	2022-01-12 20:51:33 -08: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 remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
CustomFieldsetsController.php	Merge master into develop	2022-01-12 20:51:33 -08: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	Merge master into develop	2022-01-12 20:51:33 -08:00
ProfileController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00
ReportsController.php	fix showDeletedFunction by reverting #9508	2022-03-16 20:20:46 +01:00
SettingsController.php	Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync	2022-03-29 12:06:01 +01:00
StatuslabelsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
SuppliersController.php	Added gate to supplier	2022-02-13 11:58:12 -07:00
ViewAssetsController.php	Revert the unnecessary optimization for asset->count()	2022-01-13 19:37:08 -08:00