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

..

accessory-select.blade.php

Use more modern reference for input text

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

address.blade.php

Added asterisk help text

2024-08-22 11:01:28 +01:00

asset-select.blade.php

Updated more fa icons

2021-09-26 01:11:08 -07:00

category-select.blade.php

Merge branch 'develop' into saving_custom_report_template

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

category.blade.php

Use Helper alias

2021-09-28 19:44:55 -07:00

company-select.blade.php

Merge branch 'develop' into saving_custom_report_template

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

company.blade.php

Use Helper alias

2021-09-28 19:44:55 -07:00

consumable-select.blade.php

Use more modern reference for input text

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

datepicker.blade.php

Added calendar icon for datepickers

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

department-select.blade.php

Merge branch 'develop' into saving_custom_report_template

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

depreciation.blade.php

Updated more fa icons

2021-09-26 01:11:08 -07:00

email.blade.php

Updated more fa icons

2021-09-26 01:11:08 -07:00

eol_date.blade.php

Added calendar icon for datepickers

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

fax.blade.php

Added phone, fax to departments, locations, companies

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

image-upload.blade.php

Show existing images on user edit page

2024-07-20 00:27:28 +01:00

item_number.blade.php

Use Helper alias

2021-09-28 19:44:55 -07:00

kit-select.blade.php

Use more modern reference for input text

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

license-select.blade.php

Use more modern reference for input text

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

location-profile-select.blade.php

Updated more fa icons

2021-09-26 01:11:08 -07:00

location-select.blade.php

Merge branch 'develop' into saving_custom_report_template

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

location.blade.php

Use Helper alias

2021-09-28 19:44:55 -07:00

maintenance_type.blade.php

Use Helper alias

2021-09-28 19:44:55 -07:00

manufacturer-select.blade.php

Merge branch 'develop' into saving_custom_report_template

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

manufacturer.blade.php

Use Helper alias

2021-09-28 19:44:55 -07:00

minimum_quantity.blade.php

Prevent ludicrious amount of min_qty

2024-07-11 16:22:41 +01:00

model_number.blade.php

Updated more fa icons

2021-09-26 01:11:08 -07:00

model-select.blade.php

Merge branch 'develop' into saving_custom_report_template

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

name.blade.php

Update a couple more fields for new validation

2023-11-13 19:18:04 -08:00

notes.blade.php

Small style specification for notes partial field

2023-04-03 17:37:16 -07:00

order_number.blade.php

Updated more fa icons

2021-09-26 01:11:08 -07:00

permissions-base.blade.php

Updated tooltips with data-tooltip=true from old method

2023-04-18 02:44:50 -07:00

phone.blade.php

Updated more fa icons

2021-09-26 01:11:08 -07:00

purchase_cost.blade.php

Use Helper alias

2021-09-28 19:44:55 -07:00

purchase_date.blade.php

Added calendar icon for datepickers

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

quantity.blade.php

Prevent a ludicrous amount of consumables

2024-07-11 16:22:04 +01:00

requestable.blade.php

Requestable partial - removing icheck

2023-04-03 17:38:12 -07:00

serial.blade.php

Echo out the array values in withInput()

2023-04-07 10:16:35 -07:00

status-select.blade.php

Merge branch 'develop' into saving_custom_report_template

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

status.blade.php

Update additional partials for validation

2023-11-14 12:23:46 -08:00

submit-button.blade.php

Updated icons

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

submit.blade.php

Updated icons

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

supplier-select.blade.php

Merge branch 'develop' into saving_custom_report_template

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

supplier.blade.php

Added localization strings for partials, added file structure

2021-11-19 12:12:11 +01:00

uploadLogo.blade.php

Added default_avatar to settings

2024-07-04 13:22:36 +01:00

user-select.blade.php

Wider country dropdown

2024-03-20 11:00:06 +00:00

warranty.blade.php

Use more modern reference for input text

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