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

15363 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M 633249b08a user assets get updated when a user changes location 2024-03-21 15:15:40 -07:00
Godfrey M 21c3b1fbd2 rename declined message to note, increased width of textarea 2024-03-21 14:03:25 -07:00
snipe e9e6f925bf Updated validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-21 18:34:39 +00:00
snipe 828b84084d Added validation for last_audit_date and next_audit_date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-21 18:29:38 +00:00
snipe a6a0bfacc2 Merge remote-tracking branch 'origin/develop' 2024-03-21 18:03:19 +00: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
snipe c4b7e77498
Merge pull request #14089 from spencerrlongg/bug/escaped_quotes_in_listbox 
Use `htmlentities()` instead of `htmlspecialcharacters()` on Custom Field Listbox Values
 2024-03-21 12:55:25 +00:00
snipe 91c7180bfd
Merge pull request #14469 from snipe/feature/sc-19515/2fa_reset_log 
Added 2FA reset log entry
 2024-03-21 12:52:22 +00:00
Marcus Moore b368acf941
Implement test case 2024-03-20 17:46:09 -07:00
snipe 7c39f516b9
Merge pull request #14421 from marcusmoore/fixes/add-minimal-validation-around-asset-tags 
Adds a minimal amount of validation around asset_tags in AssetsController
 2024-03-21 00:04:44 +00:00
snipe ce1ddcfcee
Merge pull request #14438 from marcusmoore/chore/sc-25071 
Removed the need to add `InteractsWithSettings` to each test case
 2024-03-21 00:03:34 +00:00
snipe 945e8b402f Only offer the 2FA reset if the user already has 2FA set up 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:52:51 +00:00
snipe 5ed2bd0fb7 Skip the normal edit observer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:52:22 +00:00
snipe bc908b854d Added icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:44:47 +00:00
snipe 2067b1138a Added the log item 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:43:58 +00:00
snipe 1ffbdee156 Updated 2FA text to not be google authenticator specific 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:43:30 +00:00
snipe bd2812cac1 Added new string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:43:12 +00:00
snipe f2a5eac256 Tightened up 2FA text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:43:05 +00:00
snipe b4e647dbd1 Merge remote-tracking branch 'origin/develop' 2024-03-20 21:31:04 +00:00
Marcus Moore 530291f81c
Implement some tests 2024-03-20 14:28:27 -07:00
snipe de18e449a6
Merge pull request #14464 from snipe/features/toggle_all_columns 
Added "toggle all" to column selector
 2024-03-20 21:26:23 +00:00
snipe dce19e0bea Set names and actions to switchable = false 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 21:25:50 +00:00
snipe 1f586d3102 Removed data-show-columns-toggle-all data attribute 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 21:25:16 +00:00
snipe e5d01170d2 Fixed locale, added showColumnsToggleAll and minimumCountColumns 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 21:24:59 +00:00
Marcus Moore 393dc51167
Add assertions around the event dispatch 2024-03-20 13:44:26 -07:00
spencerrlongg 8cc1397ace rm a couple unnecessary 2024-03-20 15:36:53 -05:00
Marcus Moore 984cc7a4f2
Scaffold tests around asset checkout via web 2024-03-20 13:29:25 -07: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
snipe 0f11963127 Merge remote-tracking branch 'origin/develop' 2024-03-20 19:01:03 +00:00
snipe d8378f2a10
Merge pull request #14468 from snipe/features/added_default_location_to_print_all_assigned 
Added default location to print all assigned
 2024-03-20 18:57:01 +00:00
snipe a0a5480c97 Added default location to print all assigned 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 18:55:47 +00: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 3391108551 Merge remote-tracking branch 'origin/develop' 2024-03-20 12:57:30 +00: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 278a25c63b Added toggle all to column selector 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 12:14:41 +00:00
snipe 0d124bb5a1 Fixed indent 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 12:08:35 +00:00
snipe 417caae589 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 12:07:18 +00:00
snipe 3d306aacc5 Fixed mismatched HTML tag 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 11:52:51 +00:00
snipe ea4ecaea03 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-03-20 11:04:34 +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