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

604 Commits

Author SHA1 Message Date
snipe 43cd0d7eb3 Use min_amt formatter 2025-09-30 10:54:43 +01:00
snipe eeea69d8f2 Make available_assets_count sortable 2025-09-30 10:51:25 +01:00
snipe 6e67e3a8a0 Fixed #17932 - incorrect number for remaining assets in asset models 2025-09-29 20:55:06 +01:00
Godfrey M 14b829aa30 add total cost to components and consumables 2025-09-16 10:37:32 -07:00
Godfrey M 384652b3df add total cost to accessories 2025-09-16 10:10:49 -07:00
snipe fe9e0444b4 Added EULA tab to user view 2025-09-16 13:20:50 +01:00
snipe 58cda5ae6d Added scopes 2025-09-15 13:22:25 +01:00
Godfrey M d5175961a4 adds a seperate formatter for checking out on license index, fix interactions 2025-09-10 12:42:10 -07:00
Godfrey M e796c0da4a disallows checkout of expired or terminated licenses 2025-09-10 12:08:14 -07:00
snipe 1da37e0d38 Added child location count 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-09 15:18:47 +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 2bee8729e4 Better escaping for display_name in API controller 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 08:14:33 +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 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 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 28abeab31d Fixed a few more display_name instances 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-29 10:06:58 +01:00
snipe 3524e23e38 Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-25 17:17:45 +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
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 618106c103 Fixed #17674 - added odp, ods, odt to accepted files 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-20 14:11:20 +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 ced30082a6 Added display_name as user field 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 12:10:28 +01:00
snipe 3b243b38c8 Fixed #9965 - fallback to category images (f there are any) when no consumable image is present 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-15 15:03:09 +02: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 ff25015595 Renamed more files 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 13:24:14 +01:00
snipe 3597f759da Updated transformers and presenters 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-07 15:37:45 +01:00
snipe c41b5e8844 Fixed license delete check 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 21:11:40 +01:00
snipe 38924ced4a Provide the role so we can use it in the javascript 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 18:45:23 +01:00
snipe eaa18e1efb Use existing actionlog methods instead of inline 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-31 13:21:40 +01:00
snipe e86e9697b3 Use plural for item type 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-28 23:33:25 +01:00
Marcus Moore d7d93b14b2 Move jobtitle under assigned_to 2025-07-22 11:02:26 -07:00
snipe 30ebea4f2d Return int count 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-02 18:24:27 +01:00
snipe b135c1eac2 Updated language strings in view 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-02 18:15:06 +01:00
snipe 88fef73d6f Use new translation 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-02 17:54:10 +01:00
Brady Wetherington 8a682beb0e Use safer deserialization defaults 2025-07-02 14:49:12 +01:00
Brady Wetherington 8bc067b18b Add escaping to user_agent and remote_ip variables for API results 2025-07-01 23:22:09 +01:00
snipe d8e7123576 Added uploaded files API controllers and presenters 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-27 11:37:31 +01:00
Godfrey M 8894bb91cc fix method choice in asset transformer for depreciations 2025-06-23 12:37:29 -07:00
snipe 317f620992 Added profile controller 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-22 19:24:19 +01:00
snipe ff01078b60 Fixed #12653 - adds job title to asset listing 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-15 02:23:53 +01:00
snipe 443f69bd82 Merge branch 'develop' into feature/department-manager-in-table 2025-06-14 23:48:52 +01:00
snipe cbdf03aa66 Nicer code formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-08 15:18:59 +01:00
snipe 7ae4a4177f Added created_by to transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-29 17:13:05 +01:00