DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-21 00:07:42 -07:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
snipe-it/app/Http/Controllers
History
snipe f2f8f96991 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Importer/ConsumableImporter.php
#	app/Models/Consumable.php
#	config/version.php
#	package-lock.json
#	package.json
#	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/views/custom_fields/fieldsets/view.blade.php
#	resources/views/layouts/default.blade.php
#	routes/web.php
#	routes/web/fields.php
2021-11-15 19:24:38 -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 remote-tracking branch 'origin/master' into develop 2021-11-15 19:24:38 -08:00
Assets Fixed dupe use statement from merge fuckery 2021-10-20 17:53:43 -07: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-10-21 13:28:58 -05: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 Adopt Laravel coding style 2021-06-10 20:15:52 +00: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 Adopt Laravel coding style 2021-06-10 20:15:52 +00: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 Merge branch 'develop' into feature/remove_deleted_user_from_unaccepted_assets_report 2021-10-28 18:11:03 -07:00
SettingsController.php Better handling if there was no file uploaded 2021-11-10 01:43:45 -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