snipe 5b02d9ed06 Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset ...

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/account/accept/create.blade.php

2022-06-29 04:58:13 -07:00

..

Controllers

Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset

2022-06-29 04:58:13 -07:00

Livewire

Add an early return if the model id is not set (for new Asset Models)

2022-01-21 11:45:45 -06:00

Middleware

Switch the barcode backend to SVG, and fix the two-factor middleware

2022-05-13 14:22:27 -07:00

Requests

Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8

2022-04-28 17:49:06 +01:00

Traits

Added a validation to use the same name in categories with different types

2021-10-08 15:19:16 -05:00

Transformers

Attempt a download via API

2022-06-28 23:59:13 -07:00

Kernel.php

Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8

2022-04-28 17:49:06 +01:00