ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
530ea474d14a937c86242ef9b93584b0a1437900
snipe-it/app/Http/Controllers
T
History
Marcus Moore 530ea474d1 Merge branch 'develop' into saving_custom_report_template 
# Conflicts:
#	resources/lang/en/admin/reports/general.php
#	resources/views/reports/custom.blade.php
2024-01-23 13:55:07 -08:00
..
Accessories
Fixed #14037 - record current time on accessory checkin
2023-12-15 16:39:18 +00:00
Account
Merge pull request #13400 from inietov/fixes/asset_acceptance_user_error
2023-08-22 15:49:56 +01:00
Api
Moved limit and offset to after additional qualifiers
2024-01-05 11:59:31 +00:00
Assets
Fixed [FD-39640]: preserve sort order when generating asset labels
2024-01-09 16:37:33 +00:00
Auth
Removed debugging/comments
2023-11-22 22:32:34 +00:00
Components
Refactored checkout screen to redirect if invalid category
2023-11-23 16:18:28 +00:00
Consumables
Refactored checkout screen to redirect if invalid category
2023-11-23 16:18:28 +00:00
Kits
Merge remote-tracking branch 'origin/master' into develop
2022-05-12 09:31:42 -07:00
Licenses
Refactored checkout screen to redirect if invalid category
2023-11-23 16:18:28 +00:00
Users
Changed verb to “restore” from “restored”
2023-11-22 20:08:41 +00: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
Fix #8208, #8896, #8985, #9789
2023-03-29 09:56:34 +02:00
AssetModelsController.php
Fixed HTML for checkboxes
2023-12-13 06:27:50 +00:00
AssetModelsFilesController.php
Fixed #13562 - allow inline view for uploaded files
2023-09-05 18:28:01 +01:00
BulkAssetModelsController.php
Updated contrller to use trans_choice
2023-04-03 18:55:09 -07:00
CategoriesController.php
…
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
Update CompaniesController.php
2023-08-13 17:18:25 +02:00
Controller.php
Updated support URL
2023-04-05 14:54:40 -07:00
CustomFieldsController.php
Added field to controller
2023-10-25 17:27:36 +01:00
CustomFieldsetsController.php
Fixed #13450 - remove escaping on saveing new custom fields
2023-08-14 22:21:41 +01:00
DashboardController.php
Calculate the proper amount of people in the dashboard if Full Company Support is enabled
2022-12-20 18:39:17 -06:00
DepartmentsController.php
Added phone, fax to departments, locations, companies
2023-07-10 19:44:21 +01:00
DepreciationsController.php
Merge branch 'develop-v6-integration' into develop-v6-rc1
2021-09-21 23:46:50 -07:00
GoogleAuthController.php
Extra debugging
2023-05-10 09:10:53 -07:00
GroupsController.php
Use corrected language string
2023-03-28 16:39:52 -07:00
HealthController.php
…
LabelsController.php
Merge pull request #13680 from marcusmoore/feature/sc-23769
2023-11-13 20:38:42 +00:00
LocationsController.php
Added phone, fax to departments, locations, companies
2023-07-10 19:44:21 +01:00
ManufacturersController.php
Changed verb to “restore” from “restored”
2023-11-22 20:08:41 +00:00
ModalController.php
Fixed visibility for constants and methods
2023-02-06 12:44:02 -08:00
ProfileController.php
Update en defaults for controllers
2023-12-24 19:44:20 +00:00
ReportsController.php
Merge branch 'develop' into saving_custom_report_template
2024-01-23 13:55:07 -08:00
ReportTemplatesController.php
Add some type hints
2024-01-17 17:41:03 -08:00
SettingsController.php
Update en defaults for controllers
2023-12-24 19:44:20 +00:00
StatuslabelsController.php
…
SuppliersController.php
Added gate to supplier
2022-02-13 11:58:12 -07:00
ViewAssetsController.php
Adds ternary to set a quantity when needed
2023-06-27 18:37:22 -06:00