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

1359 Commits

Author SHA1 Message Date
snipe 927f557672 Fixed sorting on updated/created at 2025-09-15 18:13:46 +01:00
snipe 58cda5ae6d Added scopes 2025-09-15 13:22:25 +01:00
snipe 35739c2eef Merge pull request #17835 from marcusmoore/feature/10052-assigned-assets-via-api 
Fixed #10052 - Added api endpoint for retrieving assets checked out to asset
 2025-09-15 08:38:35 +01:00
Marcus Moore 082bff2fa8 Add and use query scope helper 2025-09-09 13:04:14 -07:00
Marcus Moore eada0b0bb5 Implement test 2025-09-09 11:58:43 -07:00
Marcus Moore acc37045e4 Implement test 2025-09-09 11:34:50 -07: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
Marcus Moore 324070f345 Begin to build out test 2025-09-08 17:20:22 -07:00
snipe c5bede8594 More small display_name fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 17:15:06 +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 7da5210a01 Switched to nth from fetchOne in CSV reader 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 12:50:12 +01: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 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 52140dbe06 Log upload deletion 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 08:37:42 +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 94699893ac Updated fieldname in user API request 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-01 16:17:39 +01:00
snipe bf5668a42e Added payload to accessories API 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-01 12:23:39 +01:00
snipe d5cc61f378 Added send to API call for creating users 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-28 07:28:51 +01:00
snipe 75ab6c9b13 Merge pull request #17723 from uberbrady/improve_ldap_certificate_ignoring 
Improve ldap certificate ignoring
 2025-08-27 13:29:33 +01:00
snipe 264efb015e Fixed jobtitle field mapping 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-26 15:05:05 +01:00
Brady Wetherington e74460aefc Merge branch 'develop' into improve_ldap_certifcate_ignoring 2025-08-26 15:01:11 +01:00
snipe 469e3bd475 Nicer ldap preview layout, show all mapped fields 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-26 14:51:34 +01:00
snipe b702e3e2de Merge pull request #17492 from ischooluw/17448-feature-notes-api-endpoints 
Fixes #17448: feat(api) - API endpoint for Adding Ad-Hoc Notes to Assets
 2025-08-26 12:40:52 +01:00
snipe 07dbc6842c Are you KIDDING ME, Github?? 
This reverts commit c8e79aa5ca, reversing
changes made to e60f2b2332.

Signed-off-by: snipe <snipe@snipe.net>
 2025-08-25 15:56:28 +01:00
Brady Wetherington 13cd7071b8 WIP improving some LDAP stuff 2025-08-25 15:41:01 +01:00
snipe c8e79aa5ca Merge branch 'develop' into add-display-name-to-users-fixed 2025-08-25 15:28:20 +01:00
snipe b6d397bcca Updated ->present()->fullName() to ->display_name 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-25 14:57:34 +01:00
snipe 6503f9c667 Revert "Merge pull request #17650 from grokability/add-displayName-to-users" 
This reverts commit 4770e469b4, reversing
changes made to 29a18c7c8b.

Signed-off-by: snipe <snipe@snipe.net>
 2025-08-21 20:23:47 +01:00
snipe 4770e469b4 Merge pull request #17650 from grokability/add-displayName-to-users 
Add display name to users for LDAP/SCIM, added new sync fields
 2025-08-21 18:22:34 +01:00
snipe 11eee833bb Fixed #17667 - Switch to hyphens for windows 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-20 15:56:10 +01:00
snipe 56e687bed2 Retuen the display name in the API call 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-20 09:33:00 +01:00
snipe 1488271a83 Added #8522 - depreciation info on Asset API 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 14:48:48 +01:00
snipe 6a8e1566fe Added display_name to a few more places 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 12:56:11 +01:00
snipe ced30082a6 Added display_name as user field 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 12:10:28 +01:00
snipe c1b139fb9a Fixed #17627: custom fields not sorting correctly 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-18 12:31:03 +01:00
snipe 2141ee71d4 Merge pull request #17544 from marcusmoore/fixes/custom-field-filter 
Fixed invalid custom fields being used for filtering
 2025-08-15 14:39:09 +02:00
Marcus Moore 4a7b7183d2 Add custom_fields. prefix so custom fields can be filtered against 2025-08-11 14:58:41 -07:00
snipe ef35a0f2f1 Fixed #10284: Added mobile phone to users 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-11 18:38:22 +01:00
snipe f6b9e11810 Merge pull request #17538 from mckaygerhard/mail-log-improvements 
Mail log for #17491 and some improvements on log errors
 2025-08-11 13:05:56 +01:00
snipe 7974baddf5 Merge pull request #17551 from grokability/move-file-uploads-paths-to-base-controller 
Move the object type mapping and such to the base controller to de-dupe
 2025-08-11 05:44:39 +01:00
snipe bcf301ac17 Adds #13997 - API endpoint to sync users via LDAP 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 18:48:01 +01:00
snipe ea84728a3f Rename models uploads dir 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 17:58:11 +01:00
snipe 7a9d2454d4 Move the object type mapping and such to the base controller to de-dupe 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 16:30:32 +01:00
snipe deb1afd28b Few more replcamenents 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 14:14:21 +01:00
snipe 9e8eead71e Renamed routes and method names 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 13:29:48 +01:00
snipe ff25015595 Renamed more files 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 13:24:14 +01:00
mckaygerhard 0fdbdfd5c2 Improve log error handling regarding notification sending for issue #17491 
* when an error is generated when denying checkouts, there are not enough logs
to determine the problem from the email provider
* missing handling of log test mail config, there is none of logs cos there
is no log handling on test email, becouse all the results are just sent to
the http response and no log were writen.
 2025-08-08 12:18:04 -04:00