ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e4bd5be4fe5358836a3a3929fc66f968da42c8f9
snipe-it/app/Http/Controllers
T
History
snipe ef1eb15a91 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/permissions.php
2022-05-12 09:31:42 -07: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 remote-tracking branch 'origin/master' into develop
2022-05-10 17:26:26 -07:00
Assets
Fixed route name
2022-05-06 15:46:25 -07:00
Auth
Merge remote-tracking branch 'origin/master' into develop
2022-05-10 17:26:26 -07: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
Merge remote-tracking branch 'origin/master' into develop
2022-05-12 09:31:42 -07: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
Adds an integer casting to the order input field so it cannot be null
2022-05-01 15:27:05 -05: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
Evaluate if an item still exists before trying to get its name in the report
2022-05-01 13:25:55 -05: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