mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-03-01 22:10:25 +00:00
Code Issues Projects Releases Wiki Activity
Files
c5ec3efc705271ad8bceacf7ed51f7bd3ed65ebd
snipe-it/app/Http/Controllers/Api
History
snipe 780222d372 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	resources/views/users/print.blade.php
2022-05-10 17:26:26 -07:00
..
AccessoriesController.php
Merge remote-tracking branch 'origin/master' into develop
2022-03-03 21:59:38 -08: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
AssetsController.php
Merge remote-tracking branch 'origin/master' into develop
2022-05-10 17:26:26 -07:00
CategoriesController.php
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 13:29:12 -08:00
CompaniesController.php
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 13:29:12 -08:00
ComponentsController.php
Merge remote-tracking branch 'origin/master' into develop
2022-03-03 21:59:38 -08:00
ConsumablesController.php
Merge remote-tracking branch 'origin/master' into develop
2022-03-03 21:59:38 -08: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
DepartmentsController.php
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 13:29:12 -08:00
DepreciationsController.php
adds a Floor value for depreciation models
2021-08-16 18:14:10 -07:00
GroupsController.php
Adopt Laravel coding style
2021-06-10 20:15:52 +00:00
ImportController.php
Adopt Laravel coding style
2021-06-10 20:15:52 +00:00
LicensesController.php
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
2022-04-28 17:49:06 +01:00
LicenseSeatsController.php
Adopt Laravel coding style
2021-06-10 20:15:52 +00:00
LocationsController.php
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 13:29:12 -08:00
ManufacturersController.php
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 13:29:12 -08:00
PredefinedKitsController.php
Merge master into develop
2022-01-12 20:51:33 -08:00
ProfileController.php
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
2022-04-28 17:49:06 +01:00
ReportsController.php
adds the ability to save eula pdfs to storage, still working on storing them in the DB and exposing them in the UI
2022-03-08 16:42:27 -08:00
SettingsController.php
Ahem.
2022-02-10 22:43:51 -08:00
StatuslabelsController.php
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
2022-04-28 17:49:06 +01:00
SuppliersController.php
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 13:29:12 -08:00
UsersController.php
Added remote to allowed_columns for sorting
2022-03-04 05:44:46 -08:00