Marcus Moore
|
b52380f376
|
Migrate to new namespace
|
2024-05-29 12:07:48 -07:00 |
|
snipe
|
12e107a71b
|
Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout
Bulk Consumable Checkout
|
2024-05-29 19:42:25 +01:00 |
|
snipe
|
df1cef59d5
|
Fixes path for redirect response
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-29 18:01:40 +01:00 |
|
snipe
|
92ba889cae
|
Updated/removed facades
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-29 12:53:51 +01:00 |
|
snipe
|
f17162c2e2
|
Use artisan facade
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-29 12:40:05 +01:00 |
|
snipe
|
fb233c0aa4
|
Cleaned up facade names and references
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-29 12:38:15 +01:00 |
|
bryanlopezinc
|
5d01a06245
|
Reduce IDE errors in App\Http\Controllers\SettingsController
|
2024-05-29 08:07:49 +01:00 |
|
Marcus Moore
|
4c78da3bbf
|
Re-add json encoding of permissions
|
2024-05-28 13:03:09 -07:00 |
|
snipe
|
8ac3937bf4
|
Commented model loading on asset model
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-28 18:03:19 +01:00 |
|
snipe
|
1c1729854e
|
Use statics for location, supplier, etc
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-28 18:02:22 +01:00 |
|
snipe
|
14c78d9065
|
Use static for custom fields
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-28 18:02:09 +01:00 |
|
snipe
|
b1cb9259da
|
Re-use total to avoid duplicate count
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-28 18:01:47 +01:00 |
|
snipe
|
03b5c2e246
|
Fixed bad translation string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-28 15:21:28 +01:00 |
|
snipe
|
3df2a4a70b
|
Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-28 15:16:44 +01:00 |
|
snipe
|
6b41970e97
|
Check that selected is an array
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-28 15:15:31 +01:00 |
|
snipe
|
92eb6eb1b6
|
Add unique constraint to name
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-28 15:09:31 +01:00 |
|
Brady Wetherington
|
8df9007a8e
|
Merge branch 'snipeit_v7_laravel10' into develop
|
2024-05-27 18:08:27 +01:00 |
|
snipe
|
485caf1d92
|
Merge pull request #14755 from marcusmoore/chore/sc-25103/add-tests-around-asset-checkout
Added tests around asset checkout
|
2024-05-25 11:33:33 +01:00 |
|
U-H-T
|
2777ac96cc
|
add logo support for Brother TZe24mm labels
|
2024-05-23 11:10:23 +02:00 |
|
snipe
|
8b3ff5a82d
|
Handle potentially deleted admin users in license export
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-23 08:39:15 +01:00 |
|
Marcus Moore
|
8d74a976a1
|
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout
|
2024-05-22 16:09:27 -07:00 |
|
Marcus Moore
|
6d104251b3
|
Remove todo
|
2024-05-22 15:40:54 -07:00 |
|
Marcus Moore
|
f16c79bb9a
|
Improve event assertions
|
2024-05-22 15:38:23 -07:00 |
|
Marcus Moore
|
c7fa2c04ad
|
Add scenario
|
2024-05-22 13:33:12 -07:00 |
|
Marcus Moore
|
8ca882d1c8
|
Complete a scenario
|
2024-05-22 13:23:49 -07:00 |
|
Brady Wetherington
|
4adbd7af4c
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-05-22 21:02:11 +01:00 |
|
snipe
|
4bb7c1701f
|
Fiddled with storage facade a little more
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-22 17:44:49 +01:00 |
|
snipe
|
5fd0f56258
|
Use proper storage facade for checking if the file exists
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-22 17:38:49 +01:00 |
|
snipe
|
37d7e89e93
|
Fixed error message
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-22 17:29:43 +01:00 |
|
snipe
|
3ab197075a
|
Nicer handling of erroring when filename+log do not match
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-22 17:20:03 +01:00 |
|
snipe
|
bb96a190fd
|
Moved validator
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-22 12:34:48 +01:00 |
|
Godfrey M
|
f2693ee957
|
conditionally fixed redirect select option
|
2024-05-21 14:08:35 -07:00 |
|
Godfrey M
|
69c2cf2c4f
|
fixed assetcheckin test, created redirect option test
|
2024-05-21 13:13:25 -07:00 |
|
snipe
|
34f1ea1c0e
|
Re-order gating and refactor group syncing
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-21 10:00:49 +01:00 |
|
Godfrey M
|
a53f89cd2c
|
remove license checkout changes p2
|
2024-05-20 10:26:45 -07:00 |
|
Godfrey M
|
280c03dcad
|
remove license checkout changes
|
2024-05-20 10:25:59 -07:00 |
|
Godfrey M
|
e70fb42f87
|
remove license redirects
|
2024-05-20 10:22:01 -07:00 |
|
Brady Wetherington
|
f633dbba64
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-05-20 12:55:29 +01:00 |
|
snipe
|
771c85e347
|
Translated account save message
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-20 11:19:31 +01:00 |
|
snipe
|
ca1555d962
|
Fixed #14664 - allow additional urls in env for CSP
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-16 22:19:18 +01:00 |
|
snipe
|
54b24434e1
|
Set file name variable
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-16 19:56:58 +01:00 |
|
snipe
|
88d131666c
|
Sets purchase date as date (versus datetime) in labels
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-16 18:40:49 +01:00 |
|
snipe
|
eb0fd2f519
|
Removed stricter validation :(
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-16 16:29:11 +01:00 |
|
snipe
|
81efaa7481
|
Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form
|
2024-05-16 16:13:21 +01:00 |
|
snipe
|
6b3346d90c
|
Only attempt to decrypt if there is a value
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-16 15:28:25 +01:00 |
|
snipe
|
312ce51de6
|
Removed more debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-16 15:25:57 +01:00 |
|
snipe
|
09914f508f
|
Removed more debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-16 15:16:52 +01:00 |
|
snipe
|
45eda0f611
|
Removed debug lines
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-16 15:09:27 +01:00 |
|
snipe
|
de088d452f
|
Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance
Adds a note text area to asset acceptances/declines
|
2024-05-16 15:06:05 +01:00 |
|
Godfrey M
|
fb9a5f928f
|
removed license changes
|
2024-05-15 16:39:26 -07:00 |
|