snipe bca82684a1 Merge branch 'hotfixes/2fa_qr' into develop ... # Conflicts: # .all-contributorsrc # Dockerfile # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/ImportsController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SuppliersController.php # app/Http/Requests/ItemImportRequest.php # app/Http/Transformers/ActionlogsTransformer.php # composer.json # composer.lock # config/app.php # config/version.php # docker/startup.sh # public/css/build/all.css # public/css/dist/all.css # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json		2019-03-20 02:17:02 -07:00
..
AccessoriesTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ActionlogsTransformer.php	Fixed XSS	2019-03-18 21:09:57 -07:00
AssetMaintenancesTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
AssetModelsTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
AssetsTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
CategoriesTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
CompaniesTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ComponentsAssetsTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ComponentsTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ConsumablesTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
CustomFieldsetsTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
CustomFieldsTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
DatatablesTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
DepartmentsTranformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
DepreciationsTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
GroupsTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ImportsTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
LicenseSeatsTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
LicensesTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
LocationsTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
LoginAttemptsTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ManufacturersTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
PredefinedKitsTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
SelectlistTransformer.php	Fixing #5773: Refactoring the "clearing" of select2 lists (#5839)	2018-07-16 14:10:54 -07:00
StatuslabelsTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
SuppliersTransformer.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
UsersTransformer.php	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00