DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
16876 commits 59 branches 275 tags 321 MiB
Commit graph

4231 commits

Author SHA1 Message Date
Marcus Moore ae7d7f7d22
Merge branch 'develop' into bug/sc-28148 
# Conflicts:
#	routes/web.php
 2025-02-20 13:23:55 -08:00
Marcus Moore 43f679a554
Revert some changes from #15525 2025-02-20 12:59:16 -08:00
Marcus Moore f1bf9fcf5c
Implement test 2025-02-20 12:51:08 -08:00
Marcus Moore 992b4c7d86
Remove old comment 2025-02-20 12:50:03 -08:00
Marcus Moore 44503fc423
Use translation 2025-02-20 12:41:56 -08:00
snipe 5b63eb5a15
Merge pull request #16272 from snipe/experiments/breadcrumbs
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details 
Experimental WIP - added breadcrumbs, route model binding for resource routes
 2025-02-20 19:21:58 +00:00
snipe e0beed0fa3 Reapplied accessory gate 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 18:28:01 +00:00
snipe 76f038d142 RMB for custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 14:57:18 +00:00
snipe 3150ad50c9 RMB for audits 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 14:57:07 +00:00
snipe 80394ef788 Revert delete because route model binding + resources routes + soft deletes = sux0r 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 12:29:37 +00:00
snipe 8a70f09dd3 Temp “fix” RMB for soft-deleted users 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 12:19:31 +00:00
Marcus Moore 759c8c8f5c
Catch TypeError in addition to Exceptions when rendering barcodes 2025-02-19 12:36:50 -08:00
snipe d330ef9919 Added crumbs and RMB for custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 18:23:16 +00:00
snipe 292819afa5 Added maintenances crumbs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 14:29:06 +00:00
snipe 6b46d12d67 Added breadcrumbs on kits (sort of) 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 14:05:29 +00:00
snipe c8f2d9806a Use route model binding on kits 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 14:03:15 +00:00
snipe a617c0545e WIP license checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 08:39:25 +00:00
snipe eb7e24eeb0 Asset checkout with route model binding 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 08:39:16 +00:00
snipe 22c58678c4 License checkout controller with route model binding 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 08:38:55 +00:00
snipe 4beaf6b3ec Added item 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 08:38:40 +00:00
snipe cd7135ea77 More test fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 06:19:50 +00:00
snipe 347eb2bdee Fixed route parameters and tests to match 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 05:03:56 +00:00
snipe 82d8e1b0a9 Added item back into edit 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 04:18:57 +00:00
snipe 5a7ffa5664 Sure, whatever I guess. 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 04:18:40 +00:00
snipe 55abd242f2 Don’t know why I need to compact this? 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 04:07:09 +00:00
snipe 560311b883 Added ->with(‘item’) back in 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 03:37:34 +00:00
snipe 3954ff20b4 More tweaks to the controllers, more breadcrumbs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 03:29:31 +00:00
snipe f7d213052a Route model binding for resource groups 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 02:49:05 +00:00
snipe 972bd1ef83 Tinkering with routes for breadcrumbs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 00:37:09 +00:00
Marcus Moore cf0ce1c5ea
Start to implement tests 2025-02-18 16:24:52 -08:00
Marcus Moore 1995e1399e
Start recording ip, user agent, and source 2025-02-18 16:04:53 -08:00
Marcus Moore 79d1147f20
Add validation 2025-02-18 15:46:52 -08:00
Marcus Moore 53c084c6c0
WIP: begin to store notes 2025-02-18 15:43:58 -08:00
Marcus Moore 25215fd3c9
WIP: begin migrating notes to ui controller 2025-02-18 15:20:06 -08:00
snipe 1fe170e6a1
Merge pull request #16040 from Godmartinz/template_validate_error
Some checks failed
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Details
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details 
Adds a null check to label templates, adds return types for validation methods
 2025-02-18 21:00:10 +00:00
snipe 329fbf6a7c Scope results by location ID 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-18 19:01:16 +00:00
snipe 48ab94c15b Fixed query duplication for AssetsForShow scope 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-18 16:18:12 +00:00
snipe 7553ec3e27 Fixed equals 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-17 10:44:58 +00:00
snipe c8f82cbc2b
Merge pull request #16250 from uberbrady/improve_tls_client_side_file_caching 
Instead of saving TLS cache-files on save, cache them when used
 2025-02-13 15:46:22 +00:00
Brady Wetherington b7bd56daf7 Instead of saving TLS cache-files on save, cache them when used 2025-02-13 15:09:28 +00:00
snipe d3210c6d40 Return flat JSON instead of transformed data 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-13 14:16:32 +00:00
snipe af1159658d Added notes to transformers 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:32:37 +00:00
snipe 4e2b22135a Added notes to UI controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:32:07 +00:00
snipe 4ee5a4c5c3 Added notes to API controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:31:50 +00:00
snipe c420670ebb Small fixes to accessories files handling 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-10 22:26:00 +00:00
Brady Wetherington de3ebfecfe Ensure we don't call preg_split() with a null as the second parameter 2025-02-06 13:24:39 +00:00
Godfrey M ddc22b4d6b adds a check to see that qr code type is not none 2025-02-03 10:38:49 -08:00
Marcus Moore 1098b8cd9d
Avoid trying to divide by zero 2025-01-22 10:21:30 -08:00
snipe d5309c7d94 Added fragment to uploads for redirect 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-21 18:06:00 +00:00
snipe 0d7304eb8b Use transformer for model files 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-20 20:20:35 +00:00