DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 03:24:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14320 commits 96 branches 267 tags 296 MiB
Commit graph

14320 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Marcus Moore 984cc7a4f2
Scaffold tests around asset checkout via web 2024-03-20 13:29:25 -07: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
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
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
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
akemidx 8640cad033 was using lcoations and not locale. fixed 2024-03-19 16:11:32 -04:00
akemidx dc29717623 fixing default 2024-03-19 15:51:05 -04:00
snipe 814914924f Merge remote-tracking branch 'origin/develop' 2024-03-19 15:51:07 +00: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
Godfrey M b9986033cc removed abbr. of variable, changed variable types in migration 2024-03-18 16:03:40 -07:00
akemidx 3680e04817 migration to set legacy locations to an standardized format 2024-03-18 18:29:59 -04: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
Godfrey M 8b52d5da85 fixed typos, reordered jquery, fixed migrations 2024-03-18 12:36:54 -07:00
Marcus Moore d1dffb84dc
Remove InteractsWithSettings trait for remaining tests 2024-03-18 12:33:45 -07:00
Marcus Moore 541350916d
Merge branch 'develop' into chore/sc-25071 
# Conflicts:
#	tests/Feature/Api/Users/UpdateUserApiTest.php
#	tests/Feature/Notifications/AccessoryWebhookTest.php
#	tests/Feature/Notifications/AssetWebhookTest.php
#	tests/Feature/Notifications/ComponentWebhookTest.php
#	tests/Feature/Notifications/ConsumableWebhookTest.php
#	tests/Feature/Notifications/LicenseWebhookTest.php
 2024-03-18 12:33:31 -07:00
Godfrey M 01afa9a749 declined notes are reflected in the action logs 2024-03-18 10:50:15 -07:00
Godfrey M 57f5d4a570 deleted_msg saves to db 2024-03-18 10:45:47 -07:00
Godfrey M 4588393b76 adds declined msg to mail notif, updates lang files and checkout acceptance controller 2024-03-18 10:25:55 -07:00
Godfrey M 0fd99d410e adds a text field and jquery to show/hide text field 2024-03-18 09:36:09 -07:00