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

17308 Commits

This Branch
This Branch
All Branches
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 7120b19d3b Fixed namespace 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 18:24:27 +01:00
snipe 2197b46658 Link to admin user 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 14:03:09 +01:00
snipe 785f576b19 Merge pull request #16621 from snipe/add_notes_to_location_sidebar 
Fixed #16618 - added notes to location sidebar
 2025-04-02 13:27:48 +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 eb3dbb8c7a Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:49:53 +01:00
snipe ed908be2eb Merge pull request #16620 from snipe/#16619_fix_accessory_clone_population 
Fixed #16619 - cloning accessory was not populating fields
 2025-04-02 12:48:25 +01:00
snipe e215c5f9ee Fixed #16619 - accesory clone 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:43:42 +01:00
snipe 78f3c879ff Merge pull request #16617 from snipe/add_pdf_logo_upload 
Fixed #16257 - Added acceptance PDF logo upload
 2025-04-02 12:22:43 +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 d0f750edea Added pdf logo to the controller 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:13:28 +01:00
snipe 56ae9d0ba9 Nicer upload logo labels 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:10:27 +01:00
snipe 15917d5f99 Use new logo 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:10:14 +01:00
snipe a59d69cb0d Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:10:05 +01:00
snipe 97cba45509 Added migration 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:09:57 +01:00
snipe 365ce34940 Merge pull request #16613 from marcusmoore/chore/update-rollbar 
Update rollbar-laravel to 8.1
 2025-04-02 10:48:51 +01:00
Marcus Moore 7048eceb9d Update rollbar/rollbar-laravel 2025-04-01 16:05:32 -07:00
snipe 9d61234f0c Merge pull request #16612 from snipe/re-fix_db_dump_ssl_fix 
Fixes #16610, regression in #16543
 2025-04-01 21:32:15 +01:00
snipe bef650757d Fixes #16610, regression in #16543 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-01 21:25:35 +01:00
snipe cb6e7f7b6e Merge pull request #16561 from spencerrlongg/bug/api_get_by_serial_add_pagination 
Adds Pagination to Hardware By Serial API Request
 2025-04-01 19:26:28 +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 6c47f1c07f Added test 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-01 17:44:44 +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 40ae5d421b Updated maxLoginAttempts and throttle duration 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-01 14:36:45 +01:00
spencerrlongg bfd827e529 added more eager loading 2025-03-31 12:28:03 -05: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
snipe e10071a68e Merge pull request #16595 from uberbrady/fix_whitespace_encrypted_custom_fields_display 
Fix whitespace encrypted custom fields display [FD-46570]
 2025-03-31 18:25:13 +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 382414df98 Merge pull request #16559 from Godmartinz/StoreLabelSettings_fix 
Fix Form save error when using old label engine
 2025-03-31 12:39:08 +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
snipe 1d3069fe84 Merge pull request #16540 from marcusmoore/bug/sc-28607 
Early return null from location transformer for missing accessory
 2025-03-31 12:34:22 +01:00
snipe 13940071a9 Merge pull request #16546 from marcusmoore/bug/sc-28024 
Fixed potential bad method call and premature email sending in bulk asset checkout
 2025-03-31 12:32:50 +01:00
snipe 6870698cdc Add @ntaylor-86 as a contributor 2025-03-31 12:32:25 +01:00
snipe 4aa13c8dd4 Merge pull request #16543 from ntaylor-86/fixes/laravel-backup-ssl-error 
Fixed #16217: database config, added option to skip ssl on the database dump
 2025-03-31 12:32:00 +01:00
snipe 44db2dc78e Merge pull request #16520 from marcusmoore/bug/sc-28673 
Remove unneeded eager loading for user show page
 2025-03-31 12:31:12 +01:00
snipe 2e17e80ea9 [Snyk] Upgrade acorn from 8.14.0 to 8.14.1 #16587 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-31 12:30:09 +01:00
snipe 836d7ca8f9 [Snyk] Upgrade bootstrap-table from 1.24.0 to 1.24.1 #16588 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-31 12:29:00 +01:00
snipe 18e6a18389 Merge pull request #16576 from marcusmoore/fixes/api_company_note 
Fixed notes not being saved and update for companies via api
 2025-03-31 12:20:36 +01:00
snipe 1dd050ac0f Merge pull request #16577 from marcusmoore/tests/login-logging 
Added tests around login attempt logging
 2025-03-29 23:30:05 -01:00
Marcus Moore b8b0e3200e Add tests around loggin login attempts 2025-03-27 17:27:28 -07:00
Marcus Moore bc77c8c885 Add notes to $fillable 2025-03-27 10:57:34 -07:00
Marcus Moore c095f330e1 Add failing tests 2025-03-27 10:56:33 -07:00
Marcus Moore e0e08f284e Add tests for creating and patching companies via api 2025-03-27 10:54:42 -07:00
spencerrlongg e273c7cbc5 Refactor asset retrieval to support pagination. 
Introduced offset and limit handling for API asset queries to enable proper pagination. Adjusted the total count logic to maintain consistency in responses and ensure accurate transformation of assets.
 2025-03-25 15:21:18 -05:00
Godfrey M d28cc024cf add DefaultLabel if no label2_template is selected 2025-03-25 12:40:23 -07:00
Marcus Moore 02f109c3b5 Include input when redirecting back 2025-03-20 14:04:19 -07:00
Marcus Moore 0ed0a7f9f3 Avoid sending emails for asset checkouts that failed 2025-03-20 14:01:48 -07:00