ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,374 Commits 84 Branches 293 Tags
0004d4936caf2e7db8d4de197d47ffc2df51d2bf
Commit Graph

6093 Commits

Author SHA1 Message Date
snipe 0004d4936c Cleaned up print view 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-09 15:18:28 +01:00
snipe 2eb727bd0c Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-09 13:51:56 +01:00
snipe 57af507170 Added deleted button to locations, check for additional relations 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-09 12:20:34 +01:00
snipe 6b87c90e02 Use scope for assets for show in sidebar 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 13:33:19 +01:00
snipe 2b4d5222eb Made “add new” buttons clearer on table headers 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 12:17:29 +01:00
snipe 913b9f0c40 Reworks PR #15490 - adds location to inventory email 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 09:26:36 +01:00
snipe f340390fc8 Merge pull request #17703 from marcusmoore/17369-accessory-checkout-qty-scaffold 
Fixed issues around accessory acceptance
 2025-09-08 09:09:26 +01:00
snipe 5d03038734 Use auto-direction for <p> in preview 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-05 15:12:38 +01:00
snipe c5bede8594 More small display_name fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 17:15:06 +01:00
snipe cd9ea6ae3b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 16:56:43 +01:00
snipe 113b762ec7 Fix for null location in locations print 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 16:55:44 +01:00
snipe 18172d3896 Merge pull request #17752 from marcusmoore/fixes/existing-assets-report 
Improve expiring alerts notification layout
 2025-09-04 12:33:32 +01:00
Marcus Moore e164595a0f Fall back to displaying 1 2025-09-03 12:35:18 -07:00
Marcus Moore d29e09a3ff Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold 
# Conflicts:
#	resources/views/account/accept/create.blade.php
#	resources/views/account/accept/index.blade.php
 2025-09-03 12:26:43 -07:00
Godfrey M db9f85e9da Merge branch 'develop' into checkin_non_reassignable_license 
# Conflicts:
#	app/Models/License.php
#	resources/views/licenses/view.blade.php
#	tests/Feature/Checkins/Api/LicenseCheckInTest.php
 2025-09-03 11:09:51 -07:00
Marcus Moore 27022954b1 Inline icon 2025-09-03 10:44:19 -07:00
snipe f5c8b3eb04 Fixed #17791 - increase size of purchase cost field 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 15:03:49 +01:00
snipe 739980aa09 Merge pull request #16947 from Godmartinz/add-require-serial-to-models 
Adds require serial as Asset Model option
 2025-09-03 14:53:15 +01:00
snipe 32300cb42c Merge pull request #17788 from grokability/add-delete-log-instead-of-soft-deleting-the-log-itself 
Fixed #17777 - Log upload deletion
 2025-09-03 14:37:32 +01:00
snipe de3b1697c8 Merge pull request #17760 from Godmartinz/fix-translation-string-in-notifications 
Fixes #17759 translation used in asset check in/out notifications
 2025-09-03 14:33:57 +01:00
snipe 52140dbe06 Log upload deletion 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 08:37:42 +01:00
Marcus Moore db5bb1928e Merge branch 'develop' into fixes/existing-assets-report 
# Conflicts:
#	resources/views/notifications/markdown/report-expiring-assets.blade.php
 2025-09-02 15:07:23 -07:00
Marcus Moore 65b66beb07 Make icon more prominent 2025-09-02 14:55:46 -07:00
Marcus Moore c83504b4e7 Use display_name in place of presenter 2025-09-02 12:57:40 -07:00
Godfrey M c3a0a0415a fix MS Teams Notifications 2025-09-02 10:48:02 -07:00
snipe 709f4672b7 Merge pull request #17771 from grokability/#10107-remember-checkout-to-type 
Fixed #10107 - remember checkout to type
 2025-09-02 13:46:13 +01:00
snipe 131327a64d Fixed “undefined” error on status labels in BS tables 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-01 20:32:42 +01:00
snipe 15abe36c53 More tweaks to display 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-01 13:58:02 +01:00
snipe 3094e007ee Set session to remember checkout type 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-01 13:28:07 +01:00
snipe eb259aee22 Set asset selector to true for components since it will always be required 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-01 13:18:58 +01:00
snipe 30a9496cf5 Merge pull request #17748 from Godmartinz/parent-location-in-asset-view 
Adds #10969 Parent location to Asset Checked out to info
 2025-09-01 11:49:42 +01:00
snipe 6cefa0d0b3 Merge pull request #17745 from Godmartinz/dropdown-link-color-fix 
Fixes #17488 (Part 2) Nav dropdown link color and skin names
 2025-09-01 11:48:29 +01:00
snipe b3c583b6dc Few more ->display_name 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-29 10:17:16 +01:00
snipe 28abeab31d Fixed a few more display_name instances 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-29 10:06:58 +01:00
Marcus Moore 35b79e4d14 Remove old comments 2025-08-28 16:56:40 -07:00
Marcus Moore 751dad7f2e Inline days 2025-08-28 16:56:12 -07:00
Marcus Moore b08d86220a First pass at moving to table structure 2025-08-28 16:53:13 -07:00
Marcus Moore 3a27ecc475 Use display_name in place of name() 2025-08-28 16:22:24 -07:00
Godfrey M da6fab5d43 adds parent location to checked out to location 2025-08-28 13:37:40 -07:00
Godfrey M c5c68e9dd5 fix dropdown link color and skin names 2025-08-28 11:49:37 -07:00
snipe 6e2bcd6aa9 Merge pull request #17680 from grokability/added-telescope 
Added laravel telescope for dev environment
 2025-08-28 18:52:18 +01:00
snipe 0d7ec43262 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-28 06:19:41 +01:00
snipe af695e7dc8 Added help to user importer 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-28 06:11:52 +01:00
snipe 1edbfd87df Added welcome email checkbox to user create form 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-28 06:11:40 +01:00
snipe 454be01a6c Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-28 06:11:23 +01:00
Godfrey M 95be847d87 renamed attribute 2025-08-27 14:10:51 -07:00
Godfrey M c1a6546eba change column header 2025-08-27 14:09:13 -07:00
Godfrey M 648c25a0a7 adds item type to Accept asset index 2025-08-27 14:06:10 -07:00
snipe b11c6a5c06 Updated depreciation translation with more information. 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-27 16:35:49 +01:00
snipe adc3a34929 Fixed copy for encrypted custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-27 14:38:36 +01:00