DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 17:44:17 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
12992 commits 96 branches 267 tags 295 MiB
Commit graph

12992 commits

This branch
This branch
All branches
Author SHA1 Message Date
spencerrlongg 39c15b2868 reformat array 2024-03-27 10:35:25 -05:00
spencerrlongg 60ca634eff remove interactswithsettings 2024-03-21 12:04:53 -05:00
spencerrlongg be282dd038 resolve a couple issues 2024-03-21 09:26:45 -05:00
spencerrlongg 8cc1397ace rm a couple unnecessary 2024-03-20 15:36:53 -05:00
spencerrlongg e7b9903341 delete some extra lines 2024-03-20 15:29:06 -05:00
spencerrlongg e3e01e07b1 final cleanup 2024-03-20 15:23:45 -05:00
spencerrlongg d18aa1db98 some more cleanup + tests 2024-03-20 15:18:15 -05:00
spencerrlongg c155e4a7c9 new test for not found assets 2024-03-20 13:52:22 -05:00
spencerrlongg fdf0be09db all tests passing 2024-03-20 13:43:01 -05:00
spencerrlongg e1addc5aef oops, typo from conflict resolve 2024-03-20 13:16:36 -05:00
Spencer Long b4b4927370
Merge branch 'develop' into bug/sc-24884 2024-03-20 12:36:39 -05:00
snipe 52551dad0f
Merge pull request #14465 from snipe/features/14460_add_avif_format 
Added #14460 add avif format
 2024-03-20 12:39:14 +00:00
snipe 321414f6e3 Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 12:38:48 +00:00
snipe 7787fe42c8 Added avif to helpers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 12:30:28 +00:00
snipe 3b66912742 Fixed #14460 - added support for avif 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 12:25:02 +00:00
snipe 3d306aacc5 Fixed mismatched HTML tag 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 11:52:51 +00:00
snipe 6c90f9e395
Merge pull request #14462 from snipe/fixes/small_ui_tweaks_for_country_dropdown 
Wider country dropdown
 2024-03-20 11:01:39 +00:00
snipe ddf81ba135 Wider country dropdown 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 11:00:06 +00:00
snipe 8ebb41caa6
Merge pull request #14461 from snipe/security/update_bs_tables 
[Snyk] Upgrade bootstrap-table from 1.22.2 to 1.22.3 #14455
 2024-03-20 10:39:05 +00:00
snipe faf48b1684 [Snyk] Upgrade bootstrap-table from 1.22.2 to 1.22.3 #14455 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 10:37:53 +00:00
snipe b8232d205b
Merge pull request #14457 from Godmartinz/bulk_delete_locations_bug 
Fixed Bulk delete locations bug
 2024-03-20 10:35:45 +00:00
spencerrlongg 0ffceb9691 some notes and a little progress 2024-03-20 00:07:52 -05:00
spencerrlongg 1e810d2426 most tests now passing, still one broken 2024-03-19 19:47:26 -05:00
spencerrlongg c0110e7f29 some more tests and refinement 2024-03-19 19:27:35 -05:00
Godfrey M 62745923cf fixes API location delete 2024-03-19 15:25:28 -07:00
Godfrey M 090466123f add withCount to query instead 2024-03-19 15:18:18 -07:00
Godfrey M 38a3e36cd6 fixes translation usage 2024-03-19 14:32:21 -07:00
Godfrey M e8dc634a40 fixes translation usage 2024-03-19 14:30:53 -07:00
Godfrey M 0d0984a400 Bulk Delete Locations does not work [sc-25100] 2024-03-19 14:26:40 -07:00
spencerrlongg 86ab880c90 buncha progress 2024-03-19 15:34:59 -05:00
snipe c7083488b2
Merge pull request #14447 from snipe/feature/sc-25020_better_print_view 
Add additional options to print all assigned view
 2024-03-19 15:01:50 +00:00
snipe 4b4d383509 Removed - it’s for another PR 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-19 15:00:26 +00:00
snipe 21e23baa37 Fixed ternary 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 21:28:46 +00:00
snipe fcd130ae15 Layout improvements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 21:17:46 +00:00
snipe 002fd4ce30 Nicer formatting for signoff 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 13:44:51 +00:00
snipe 7b4ecb275f Use trans choice for language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 13:29:01 +00:00
snipe 2df5d3a8ff Fixed column selector 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 13:06:08 +00:00
snipe da62d6af26
Merge pull request #14445 from snipe/fixes/check_for_valid_license_category_on_view_assets 
Make sure the category is still valid before displaying on view assets
 2024-03-18 12:30:15 +00:00
snipe d0d4d14787 Make sure the category is still valid before displaying on view assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 12:29:00 +00:00
snipe 09d69b214b
Merge pull request #14436 from marcusmoore/chore/sc-24901 
Organized notification test cases
 2024-03-18 12:20:23 +00:00
snipe 0e2aaebda4
Merge pull request #14406 from mauro-miatello/develop 
Hide/Show ecnrypted values when click on the lock icon
 2024-03-18 12:19:54 +00:00
snipe ec2c58163f
Merge pull request #14437 from marcusmoore/chore/sc-25070 
Removed dead test code
 2024-03-18 12:19:35 +00:00
Marcus Moore 948dc3c974
Remove duplicate trait 2024-03-14 13:11:53 -07:00
Marcus Moore 1afb724606
Remove commented (and old) test cases 2024-03-14 13:11:43 -07:00
Marcus Moore 451281d833
Delete test cases with only commented code 2024-03-14 13:11:27 -07:00
Marcus Moore 485f11c945
Move trait usage to parent TestCase 2024-03-14 12:56:49 -07:00
Marcus Moore dbc79655b0
Cleanup 2024-03-14 12:02:56 -07:00
Marcus Moore 02f6aa6161
Add group tag for new test case 2024-03-14 11:19:36 -07:00
Marcus Moore 07c5264b41
Organize email check in notifications test 2024-03-14 11:17:47 -07:00
Marcus Moore 7c178a6a78
Merge branch 'develop' into chore/sc-24901 
# Conflicts:
#	tests/Feature/Notifications/AssetWebhookTest.php
 2024-03-14 11:13:14 -07:00