mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-08 10:05:22 +00:00
Code Issues Projects Releases Wiki Activity
Files
5b02d9ed06d306c8f50eaabfaf949d38434e45fa
snipe-it/app/Http/Controllers
History
snipe 5b02d9ed06 Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/account/accept/create.blade.php
2022-06-29 04:58:13 -07:00
..
Accessories
Fix several typos
2022-04-05 16:12:31 -05:00
Account
adds acceptance for consumables and components
2022-06-23 11:52:35 -07:00
Api
Attempt a download via API
2022-06-28 23:59:13 -07:00
Assets
Merge pull request #11405 from snipe/fixes/use_db_column_instead_of_converted_value
2022-06-27 17:36:26 -07:00
Auth
Return error if token is incorrect
2022-06-21 19:30:51 -07:00
Components
Fix several typos
2022-04-05 16:12:31 -05:00
Consumables
Fix several typos
2022-04-05 16:12:31 -05: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
Save the user id who is creating the user
2022-06-23 17:19:08 -07: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
Add error message when the default customfield values can't be validated
2022-06-22 22:17:05 -05:00
AssetModelsFilesController.php
Allow models uploads
2022-06-28 15:50:07 -07:00
BulkAssetModelsController.php
Merge master into develop
2022-01-12 20:51:33 -08: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
…
Controller.php
…
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
…
DepartmentsController.php
…
DepreciationsController.php
…
GroupsController.php
…
HealthController.php
…
ImportsController.php
…
LocationsController.php
Check for valid location before trying to print
2022-06-03 16:56:15 -07:00
ManufacturersController.php
…
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
Add filter to only get Assets for the unaccepted assets report
2022-05-18 14:46:48 -05:00
SettingsController.php
Disallow backup deletion and log attempt if not allowed
2022-06-24 15:49:22 -07:00
StatuslabelsController.php
…
SuppliersController.php
Added gate to supplier
2022-02-13 11:58:12 -07:00
ViewAssetsController.php
remove unused route, controller functions and view
2022-02-13 12:10:19 +01:00