Marcus Moore 8bba11e1bb Merge branch 'develop' into saving_custom_report_template ...

# Conflicts:
#	app/Http/Controllers/ReportsController.php
#	resources/views/partials/forms/edit/category-select.blade.php
#	resources/views/partials/forms/edit/company-select.blade.php
#	resources/views/partials/forms/edit/location-select.blade.php
#	resources/views/partials/forms/edit/manufacturer-select.blade.php
#	resources/views/partials/forms/edit/model-select.blade.php
#	resources/views/partials/forms/edit/status-select.blade.php
#	resources/views/reports/custom.blade.php

2024-09-17 15:26:35 -07:00

..

accessories

Aaaand more

2024-08-18 22:26:57 +01:00

account

Fixed #15483 - show EOL by default

2024-09-11 12:25:09 +01:00

asset_maintenances

Added calendar icon for datepickers

2024-08-18 18:24:26 +01:00

auth

More icons

2024-08-18 18:34:13 +01:00

blade

Allow id to be rendered

2024-08-20 11:08:53 -07:00

categories

Cleaned up category title

2024-08-21 10:29:51 +01:00

companies

Moar icon replacement

2024-08-18 18:13:49 +01:00

components

Fixed spacing

2024-08-18 22:39:14 +01:00

consumables

fixes consumables positioning with smaller media

2024-09-11 10:49:27 -07:00

custom_fields

Moar icon replacement

2024-08-18 18:13:49 +01:00

departments

Added phone, fax to departments, locations, companies

2023-07-10 19:44:21 +01:00

depreciations

Added click to select on models table

2024-08-28 12:42:23 +01:00

errors

And still more

2024-08-18 21:57:37 +01:00

groups

Moar icon replacement

2024-08-18 18:13:49 +01:00

hardware

Fixed tests again

2024-09-11 17:29:22 +01:00

kits

Added calendar

2024-08-18 18:48:19 +01:00

layouts

rephrased the ternary <-correctly spelled

2024-09-10 11:05:03 -07:00

licenses

Few more

2024-08-19 13:39:24 +01:00

livewire

Merge branch 'develop' into fixes/custom-field-values

2024-09-09 16:07:37 -07:00

locations

Little more padding

2024-08-19 14:16:57 +01:00

manufacturers

Updated more icons

2024-08-19 11:58:05 +01:00

modals

Merge pull request #14667 from Godmartinz/add_location_to_create_user_via_asset

2024-08-22 13:25:41 +01:00

models

Updated buttons on models

2024-08-19 12:32:44 +01:00

notifications

removed indent from blades

2024-08-13 10:21:33 -07:00

paginator

…

partials

Merge branch 'develop' into saving_custom_report_template

2024-09-17 15:26:35 -07:00

reports

Merge branch 'develop' into saving_custom_report_template

2024-09-17 15:26:35 -07:00

settings

Fixed extra closing p tag

2024-08-22 12:56:32 +01:00

setup

Use more modern reference for input text

2024-06-27 15:05:47 +01:00

statuslabels

Use more modern reference for input text

2024-06-27 15:05:47 +01:00

suppliers

Fixed suppliers buttons

2024-08-19 13:20:06 +01:00

users

Fixed check for outside assets on user update validation

2024-09-17 15:46:45 +01:00

vendor

Add missing parentheses to conditional

2024-08-19 14:31:47 -07:00

dashboard.blade.php

Updated icons

2024-08-18 17:26:44 +01:00

notifications.blade.php

Added confetti option

2024-08-15 11:32:42 +01:00