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

7636 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 7a6fdc4e0a Added parent ID to location API 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-09 15:18:09 +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
Godfrey M e652a7fd61 fix tests 2025-09-08 14:56:15 -07:00
Godfrey M 00e8fd0483 cloned mailable 2025-09-08 14:44:58 -07:00
snipe 72466f1aab Revert "Merge pull request #17823 from grokability/#17822-fix-n+1-in-topmenu" 
This reverts commit 6901deccbf, reversing
changes made to 6b87c90e02.

Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 15:04:28 +01:00
snipe 5a9c906eb9 Added filter to assets loading 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 14:32:58 +01:00
snipe b95b60b49e Use eager-loaded model assets 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 14:07:49 +01:00
snipe 14408ef18f Fixed n+1 in top menu check 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 13:55:22 +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 9604ecebad Fixed jobtitle in advanced search 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 12:01:59 +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 be81e74921 Shifted log meta position 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 08:24:50 +01:00
snipe 2bee8729e4 Better escaping for display_name in API controller 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 08:14:33 +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 78704d8b85 Fixed #17803 - checked out to name in custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 16:51:10 +01:00
snipe 1109db76fe Merge pull request #17797 from grokability/#17796-search-on-model-name-and-number 
Fixed #17796 - search on model name and number on importer
 2025-09-04 16:35:43 +01:00
snipe 1fa553c785 Use nths 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 16:04:16 +01:00
snipe 905f61371d Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 16:02:40 +01:00
snipe 7da5210a01 Switched to nth from fetchOne in CSV reader 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 12:50:12 +01: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
snipe 19aea4bd6c Fixed #17798 - added require_serial to model importer 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 15:25:56 +01:00
snipe 090890e9c6 Fixed #17796 - search on model name and number on importer 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 15:15:29 +01:00
snipe b06c58fe7b Switch to older style rules for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 15:06:27 +01: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
Godfrey M cd2e7ee31d fix google and slack notifications 2025-09-02 10:53:42 -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 7bd3a791a1 Added withTrashed() to allow viewing files on deleted objects 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-02 13:39:35 +01:00
snipe b9cfc03b4f display name fix 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-02 11:30:34 +01:00
snipe 77d002a158 Use null for role as well 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-01 16:43:05 +01:00
snipe 94699893ac Updated fieldname in user API request 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-01 16:17:39 +01:00
snipe 9f81989bdd Return null instead of blank for display_name in API 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-01 16:06:28 +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 bf5668a42e Added payload to accessories API 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-01 12:23:39 +01:00
Speedyduck300000 53b96168a9 fixed uploadfilescontroller to use the file_id to delete the correct 
entry.
 2025-09-01 07:34:18 +02:00
Godfrey M eadce51f10 fixes check in check out translations for assets in notiications 2025-08-29 11:12:05 -07: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
snipe ca95b29cd6 Add telescope tables to the excepted tables 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-28 19:52:56 +01:00
snipe 44fbde26fa Merge pull request #17743 from grokability/normalize-trait-locations 
Moved model traits into proper directory
 2025-08-28 18:52:43 +01: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 7b5d90dd81 Moved model traits into proper directory 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-28 18:23:26 +01:00
snipe 315a812df5 Fixed typos 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-28 16:41:56 +01:00