ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,308 Commits 84 Branches 293 Tags
df1c7c4f95e6c2360062afa00a2492f99b2240ff
Commit Graph

5375 Commits

Author SHA1 Message Date
snipe df1c7c4f95 Merge pull request #16609 from snipe/login_throttle_update 
Updated login attempts and throttle duration
 2025-04-02 18:28:34 +01:00
snipe 2197b46658 Link to admin user 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 14:03:09 +01:00
snipe 31e337255a Use adminuser instead of created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 13:26:12 +01:00
snipe f12d173581 Fixed #16618 - added notes to location sidebar 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 13:23:33 +01:00
snipe cb59c23f0b Added pdf logo to the blade 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:13:34 +01:00
snipe 56ae9d0ba9 Nicer upload logo labels 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:10:27 +01:00
snipe a59d69cb0d Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:10:05 +01:00
snipe c305284930 Merge pull request #15922 from spencerrlongg/feature/sc-24347 
Requestable/Request Item API Endpoints
 2025-04-01 18:15:42 +01:00
snipe 5d265f5bfd Change to minutes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-01 15:01:34 +01:00
snipe daaad4fe9d Removed unneeded strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-01 14:36:53 +01:00
snipe d95549bbcf Merge pull request #16594 from uberbrady/fix_consumable_model_copy 
Fixes [FD-47675 ] Fix consumable model number copy-to-clipboard button
 2025-03-31 18:26:46 +01:00
Brady Wetherington 92a77afd0b Fixes the clipboard button copying whitespace at the end of custom fields 2025-03-31 13:55:38 +01:00
Brady Wetherington 1369b993a4 Fix JS copy-to-clipboard for consumable model_num 2025-03-31 13:13:37 +01:00
snipe 6846c7d510 Merge pull request #16536 from akemidx/moving_warranty_info 
Moving warranty/depreciation to be with the other cost/eol values
 2025-03-31 12:35:32 +01:00
Godfrey M 0ad985cbcd change translation 2025-03-20 12:40:46 -07:00
akemidx 5944034b8b moving warranty/depreciation to be with the other cost/eol values 2025-03-19 15:22:09 -04:00
snipe c711278b8b Merge pull request #16486 from marcusmoore/bug/sc-28639 
Fixed location being automatically populated on asset checkin screen
 2025-03-12 23:26:08 +00:00
snipe ff637f1926 Merge pull request #16497 from marcusmoore/fixes/diff-in 
Fixed various carbon displays
 2025-03-12 23:17:48 +00:00
Marcus Moore 4d978e0fc6 Fix eol rate in upcoming audit notification 2025-03-12 16:04:16 -07:00
snipe 036c225dcf Fixed dashboard string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-12 21:22:24 +00:00
snipe 083cf78305 Added footer style for nicer number cell padding 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-12 21:17:41 +00:00
Marcus Moore 6cf7df22cd Fix eol rate on asset show page 2025-03-12 13:28:34 -07:00
snipe bdb4bd73d2 Return an indicator for no value set 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-12 20:18:51 +00:00
snipe bf88597132 Added qtySumFormatter and made seats formatter more generic 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-12 20:14:23 +00:00
snipe aa8e9f61d2 Check for value override 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-12 17:28:44 +00:00
snipe 163ddc8026 Check for value override 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-12 17:28:29 +00:00
Marcus Moore 18b208bba2 Account for missing location 2025-03-11 11:46:38 -07:00
Marcus Moore 71d93ca3c3 Use dedicated location select component 
Copy/paste/modify from partials.forms.edit.location-select
 2025-03-11 11:41:26 -07:00
Marcus Moore bac2760c6d Replace Form::close 2025-03-10 12:55:35 -07:00
Marcus Moore d88fe1f48a Merge branch 'develop' into chore/migrate-select-helper 2025-03-06 13:39:05 -08:00
snipe f42fcd25b1 Make the assets tab active by default on locations page 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-06 12:05:36 +00:00
Marcus Moore 70de08a211 Replace hard-coded link to report template 2025-03-05 16:26:26 -08:00
snipe 0e1f40626f Updated label colors in blue skin 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-05 13:40:36 +00:00
snipe fcf7a543fd Check if $item is set 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-05 10:47:33 +00:00
Spencer Long 6201e475cb Merge branch 'develop' into feature/sc-24347 2025-03-04 21:20:46 -06:00
snipe bef54983fa Merge pull request #16421 from marcusmoore/chore/migrate-label-helpers-pt8 
Replace calls to Form::label pt8
 2025-03-05 01:01:21 +00:00
Marcus Moore f2b44f7002 Replace Form::label in company select partial 2025-03-04 16:46:43 -08:00
Marcus Moore de7d32f632 Replace Form::label on ldap settings page 2025-03-04 16:44:26 -08:00
Marcus Moore c798df2920 Replace Form::label on label settings page 2025-03-04 16:34:22 -08:00
snipe 779330af14 Merge pull request #16420 from marcusmoore/fixes/report-url 
Fixed custom report template route
 2025-03-05 00:11:30 +00:00
Marcus Moore f01ff1f1d7 Add dedicated named route 2025-03-04 16:07:35 -08:00
Marcus Moore 1e4daf0348 Fix route 2025-03-04 16:04:28 -08:00
Godfrey M 49ff47fbcf Merge branch 'develop' into visited_link-color-change 2025-03-04 14:47:48 -08:00
snipe a31a732d38 Nicer UI for invert flag 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-04 20:38:15 +00:00
snipe 1dacd25e6d Check for purchase_cost before adding the “each” 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-04 19:50:11 +00:00
Marcus Moore 2a156776a4 Merge branch 'develop' into chore/migrate-select-helper 
# Conflicts:
#	resources/views/settings/branding.blade.php
#	resources/views/settings/general.blade.php
 2025-03-04 11:19:38 -08:00
Godfrey M 5eebdcddb2 changes visited and link colors 2025-03-04 10:12:45 -08:00
snipe ccea55308b Fixed regression from #16150 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-04 15:53:30 +00:00
snipe c4722898b7 Fixed #16407 - weird layout on components for non super user 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-04 15:37:25 +00:00
snipe 369a68fe57 Fixed #16402 - Localize “each” in string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-04 13:33:04 +00:00