snipe ea83567e7d Merge pull request #10494 from exula/fix/increase_max_licenses ... Fixed #7824		2022-01-10 15:04:47 -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 pull request #10494 from exula/fix/increase_max_licenses	2022-01-10 15:04:47 -08:00
Assets	Applied escaping fix from master to develop	2021-11-24 19:38:27 -08:00
Auth	Fix FIXME's by downgrading them to TODO's :)	2021-11-10 11:37:10 -08: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	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00
Licenses	Fixed #7824	2022-01-10 14:03:28 -05:00
Users	Merge pull request #10264 from nuraeil/added-localized-strings	2022-01-10 14:48:52 -08:00
ActionlogController.php
AssetMaintenancesController.php	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
AssetModelsController.php	Merge master down into develop	2021-12-16 14:26:24 -08:00
BulkAssetModelsController.php	Adds reqestable as model bulk edit field	2021-10-28 15:15:54 -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
Controller.php
CustomFieldsController.php	Small merge unmagling	2021-12-16 14:38:04 -08:00
CustomFieldsetsController.php
DashboardController.php
DepartmentsController.php
DepreciationsController.php	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
GroupsController.php
HealthController.php
ImportsController.php
LocationsController.php
ManufacturersController.php
ModalController.php
ProfileController.php
ReportsController.php	Add title column to custom reports	2021-12-14 12:05:33 -06:00
SettingsController.php	Small merge unmagling	2021-12-16 14:38:04 -08:00
StatuslabelsController.php
SuppliersController.php
ViewAssetsController.php