Godfrey M f29a383179 Merge branch 'develop' into seperating_notification_n_mail ...

# Conflicts:
#	app/Notifications/CheckoutConsumableNotification.php

2024-10-23 15:15:14 -07:00

..

Accessories

Fixed todos with log message

2024-10-21 16:52:21 +01:00

Account

email comes through, no picture and html markup appear though.

2024-10-16 12:21:33 -07:00

Api

Added manufacturer and model_number to components

2024-10-23 17:50:22 +01:00

Assets

Squashed commit of the following:

2024-10-22 15:43:19 +01:00

Auth

Prevent passing an array as login

2024-08-18 04:51:36 +01:00

Components

Added manufacturer and model_number to components

2024-10-23 17:50:22 +01:00

Consumables

Added ability to checkout consumables in variable qty

2024-10-23 15:05:35 +01:00

Kits

Added created_by to kits

2024-09-19 17:01:17 +01:00

Licenses

Fixed todos with log message

2024-10-21 16:52:21 +01:00

Users

Fixed todos with log message

2024-10-21 16:52:21 +01:00

ActionlogController.php

…

AssetMaintenancesController.php

Change user_id to created_by

2024-09-17 22:16:41 +01:00

AssetModelsController.php

Change user_id to created_by

2024-09-17 22:16:41 +01:00

AssetModelsFilesController.php

…

BulkAssetModelsController.php

…

CategoriesController.php

Change user_id to created_by

2024-09-17 22:16:41 +01:00

CheckInOutRequest.php

…

CompaniesController.php

Added created by to company on save

2024-09-19 20:34:54 +01:00

Controller.php

…

CustomFieldsController.php

Use auth()->id() instead of Auth::id()

2024-09-19 17:31:46 +01:00

CustomFieldsetsController.php

Change user_id to created_by

2024-09-17 22:16:41 +01:00

DashboardController.php

Reflash session so login message is displayed

2024-09-09 14:54:19 -07:00

DepartmentsController.php

Change user_id to created_by

2024-09-17 22:16:41 +01:00

DepreciationsController.php

Change user_id to created_by

2024-09-17 22:16:41 +01:00

GoogleAuthController.php

…

GroupsController.php

…

HealthController.php

Removed die()

2024-10-02 15:48:35 +01:00

LabelsController.php

…

LocationsController.php

Change user_id to created_by

2024-09-17 22:16:41 +01:00

ManufacturersController.php

Change user_id to created_by

2024-09-17 22:16:41 +01:00

ModalController.php

…

ProfileController.php

Change controller to assume a collection. (This is dumb, but whatever)

2024-10-03 16:19:27 +01:00

ReportsController.php

Merge remote-tracking branch 'upstream/develop' into eol_date_range_for_reports

2024-08-19 19:33:44 -04:00

SettingsController.php

Remove form request from get LDAP method

2024-10-09 22:15:49 +01:00

StatuslabelsController.php

Change user_id to created_by

2024-09-17 22:16:41 +01:00

SuppliersController.php

Change user_id to created_by

2024-09-17 22:16:41 +01:00

ViewAssetsController.php

change error to warning

2024-10-01 14:24:03 -05:00