snipe 288cc01c41 Merge branch 'features/accessories_users' into develop ...

# Conflicts:
#	app/Http/Controllers/Api/UsersController.php
#	config/version.php
#	routes/api.php

2019-03-01 17:30:03 -08:00

..

Accessories

[WIP] Added #5957 - Flysystem support (#6262)

2018-09-29 21:33:52 -07:00

Account

[WIP] Added #5957 - Flysystem support (#6262)

2018-09-29 21:33:52 -07:00

Api

Merge branch 'features/accessories_users' into develop

2019-03-01 17:30:03 -08:00

Assets

Fixed wonky merge :(

2019-02-13 06:52:36 -08:00

Auth

Merge branch 'develop' into dev-master-integration

2019-02-13 06:42:52 -08:00

Components

[WIP] Added #5957 - Flysystem support (#6262)

2018-09-29 21:33:52 -07:00

Consumables

simplified checkout event handling per @uberbrady’s suggestion

2018-09-10 16:40:26 +02:00

Licenses

Fix an issue when trying to checkin a license seat. [ch46] (#6599)

2019-01-17 20:36:40 -08:00

Users

Fixed #6061 - Assigned user group cannot be removed

2019-02-12 23:49:42 -08:00

ActionlogController.php

Discussion: Moving to policies for controller based authorization (#3080)

2016-12-19 11:04:28 -08:00

AssetMaintenancesController.php

Handle asset maintenances that do not have a valid asset associated

2019-01-16 02:26:42 -08:00

AssetModelsController.php

[WIP] Added #5957 - Flysystem support (#6262)

2018-09-29 21:33:52 -07:00

BulkAssetModelsController.php

Change $request->has to $request->filled unilaterally

2018-07-24 22:51:31 -07:00

CategoriesController.php

[WIP] Added #5957 - Flysystem support (#6262)

2018-09-29 21:33:52 -07:00

CheckInOutRequest.php

Monster: Cleanup/Refactor http controllers. (#5916)

2018-07-24 19:35:26 -07:00

CompaniesController.php

Fixed #6491 - cleaner return methods for PHP 7.3 compact()

2018-12-12 18:23:39 -08:00

Controller.php

Updated docblocks

2016-04-07 13:21:09 -07:00

CustomFieldsController.php

Initialize customFormat to prevent Blade error when creating new fields (#6596)

2019-01-15 13:56:56 -08:00

CustomFieldsetsController.php

I have no idea why this was necessary suddenly

2018-09-06 14:28:04 -07:00

DashboardController.php

Call migrate before passport install

2017-10-11 12:42:31 -07:00

DepartmentsController.php

[WIP] Added #5957 - Flysystem support (#6262)

2018-09-29 21:33:52 -07:00

DepreciationsController.php

Fixed #6491 - cleaner return methods for PHP 7.3 compact()

2018-12-12 18:23:39 -08:00

GroupsController.php

Fixed typo

2019-01-24 15:21:38 -08:00

ImportsController.php

Monster: Cleanup/Refactor http controllers. (#5916)

2018-07-24 19:35:26 -07:00

LocationsController.php

Fixed #6491 - cleaner return methods for PHP 7.3 compact()

2018-12-12 18:23:39 -08:00

ManufacturersController.php

Fixed #6491 - cleaner return methods for PHP 7.3 compact()

2018-12-12 18:23:39 -08:00

ModalController.php

Remove old helpers (#5843)

2018-07-16 14:22:25 -07:00

ProfileController.php

Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop

2019-02-13 23:02:21 -08:00

ReportsController.php

Fixed #6625 - include fully depreciated date in custom asset report

2019-01-24 12:38:17 -08:00

SettingsController.php

Allow multiple upload fields and add logo option to labels (#6736)

2019-03-01 15:25:42 -08:00

StatuslabelsController.php

Fixed #6491 - cleaner return methods for PHP 7.3 compact()

2018-12-12 18:23:39 -08:00

SuppliersController.php

Merge branch 'develop' into dev-master-integration

2019-02-13 06:42:52 -08:00

ViewAssetsController.php

LDAP fixes (#6533)

2019-01-10 13:20:43 -08:00