Marcus Moore d4861a74df Merge branch 'develop' into chore/sc-23725/livewire3 ...

# Conflicts:
#	composer.lock

2024-06-25 10:15:50 -07:00

..

accessories

Pass item’s currency if set by location

2024-05-28 10:24:10 +01:00

account

Made requestable items more generic in translations

2024-06-20 15:26:45 +01:00

asset_maintenances

Used inline markdown in views

2023-07-12 16:57:04 +01:00

auth

Move Google Login prompt higher, made it bigger

2024-01-05 14:56:34 +00:00

categories

Remove unneed jquery

2023-08-02 18:04:21 -07:00

companies

Removed initial check for assets, licenses, etc

2024-02-05 15:30:18 +00:00

components

Merge pull request #13805 from gitgrimbo/more_line_based_markdown

2024-02-05 17:19:41 +00:00

consumables

Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout

2024-05-29 19:42:25 +01:00

custom_fields

Changed icon, added translation

2024-05-25 10:20:52 +01:00

departments

Added phone, fax to departments, locations, companies

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

depreciations

Update a couple more fields for new validation

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

errors

Fixed #12772 - use the APP_URL config more consistently

2023-04-05 16:05:40 -07:00

groups

Fixed string path

2024-05-29 00:26:33 +01:00

hardware

Moved expected checkin date on view

2024-06-05 10:28:35 +01:00

kits

Fixed kit parse error on model edit

2022-10-18 15:00:33 -07:00

layouts

Merge branch 'develop' into chore/sc-23725/livewire3

2024-06-25 10:15:50 -07:00

licenses

remove license checkout changes

2024-05-20 10:25:59 -07:00

livewire

Fix category edit form component

2024-06-17 14:24:16 -07:00

locations

Removed data-show-columns-toggle-all data attribute

2024-03-20 21:25:16 +00:00

manufacturers

Removed loading of assets for label count

2024-02-05 18:56:51 +00:00

modals

Remove city as required field on location modal

2024-04-08 10:50:52 +01:00

models

Properly scope archived based on settings

2024-06-18 10:27:11 +01:00

notifications

Fixed #14812 - added consumables to individual inventory report

2024-06-05 20:40:45 +01:00

paginator

…

partials

Merge pull request #14791 from Godmartinz/label-option-limit

2024-06-20 13:51:49 +01:00

reports

Better translation for custom fields

2024-05-25 10:39:47 +01:00

settings

Merge branch 'develop' into chore/sc-23725/livewire3

2024-06-25 10:15:50 -07:00

setup

Defaulted to en-US on quickstart

2023-12-19 20:16:00 +00:00

statuslabels

fixed translation choice and color choice

2023-08-14 12:20:46 -07:00

suppliers

Removed loading of assets for label count

2024-02-05 18:56:51 +00:00

users

Merge branch 'develop' into chore/sc-23725/livewire3

2024-06-12 15:12:40 -07:00

vendor

that's all folks

2023-12-06 16:20:30 -06:00

dashboard.blade.php

Removed extra divs

2024-06-17 12:52:23 +01:00

notifications.blade.php

Use storage helper

2024-05-31 18:48:09 +01:00