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

19450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snipe 00a17cd55e Merge remote-tracking branch 'origin/develop' 2025-08-21 11:51:50 +01:00
snipe 952b6f33bb Add @strobelm as a contributor 2025-08-21 11:51:37 +01:00
snipe c57c4b8ff2 Merge pull request #17691 from qay21/fix-components-url 
Fix components presenting wrong URLs
 2025-08-21 11:37:27 +01:00
qay d8dd274c08 Fix components presenting wrong URLs 2025-08-21 12:26:13 +02:00
snipe 15f97b6cb9 Merge pull request #17591 from Godmartinz/add-serial-to-expiring-asset-report 
Adds #17440 serial number column to Expiring Assets Report
 2025-08-21 11:14:45 +01:00
snipe f39afe5a65 Merge remote-tracking branch 'origin/develop' 2025-08-20 15:56:19 +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 7612ee6b08 Merge remote-tracking branch 'origin/develop' 2025-08-20 14:17:38 +01:00
snipe fec9d716ee Merge pull request #17679 from grokability/#17674-add-ods-and-odt 
Fixed #17674: added .ods, .odp, and .odt as acceptable upload types
 2025-08-20 14:17:08 +01:00
snipe da5b1afd19 Removed logging 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-20 14:11:42 +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 2ed2b0101a Merge remote-tracking branch 'origin/develop' 2025-08-20 12:43:57 +01:00
snipe 312be98132 Add @FlorestanII as a contributor 2025-08-20 12:43:43 +01:00
snipe e0bb77a6d6 Merge pull request #17664 from FlorestanII/feature/support-for-dymo-11354-labels 
Support for Dymo 11354 Labels.
 2025-08-20 12:43:29 +01:00
snipe 5ca9d31964 Merge remote-tracking branch 'origin/develop' 2025-08-20 11:32:27 +01:00
snipe 855922c21a Account for null in tetss (vs 0) 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-20 11:32:16 +01:00
snipe bc645d2621 Use email formatter in licensed_to_email display 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-20 11:24:16 +01:00
snipe 2fcd8cd261 Merge remote-tracking branch 'origin/develop' 2025-08-20 11:00:26 +01:00
snipe 9c06ff3899 Check for numeric 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-20 11:00:18 +01:00
snipe 2a37aa3b49 Fixed tooltip 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-20 10:34:05 +01:00
snipe 0ffa47a2c6 Merge remote-tracking branch 'origin/develop' 2025-08-20 09:58:54 +01:00
snipe bf591320af Fixed #17665 - delete custom report modal 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-20 09:58:30 +01:00
snipe 9efb49d510 Merge pull request #17663 from Godmartinz/sub-out-translation 
Fixes #17653 changes translation to administrator
 2025-08-19 19:43:47 +01:00
Godfrey M 9eb686fe08 changes translation to administrator 2025-08-19 10:23:15 -07:00
Johannes Pollitt 765051ce88 Added LabelWriter for 11354 format labels. 
Printable for example with the Dymo LabelWriter 450.
 2025-08-19 19:21:48 +02:00
Godfrey M ed402e0122 adds serial underneath name 2025-08-19 10:10:20 -07:00
snipe e203d4dee3 Merge remote-tracking branch 'origin/develop' 2025-08-19 14:49: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 b47d773e13 Merge remote-tracking branch 'origin/develop' 2025-08-19 14:34:32 +01:00
snipe 48bbf8d005 Merge pull request #17655 from uberbrady/add_category_indexes 
Add new indexes to category_id and deleted_at
 2025-08-19 14:26:38 +01:00
Brady Wetherington e97b969d66 Add new indexes to category_id and deleted_at 2025-08-19 14:20:36 +01:00
snipe a8d0a4a95d Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/dist/all.js
#	public/js/dist/all.js.map
#	public/mix-manifest.json
 2025-08-19 14:12:58 +01:00
snipe cdd12df81a Fixed #17627 - jquery UI fix for draggable/sortable 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 14:12:06 +01:00
snipe 3fb0804cef Merge remote-tracking branch 'origin/develop' 2025-08-19 13:57:36 +01:00
snipe 050a3afc74 Fixed #17649 - nicer layout on new location modal 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 13:56:21 +01:00
snipe 551822ce7d Merge pull request #17648 from grokability/possible-fix-for-#17641-map-mobile-via-scim 
Fixed #17641: map mobile number via SCIM
 2025-08-19 13:09:07 +01:00
snipe 4b8c371097 Updated true to false 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 12:59:28 +01:00
snipe f6c64abc1a Fixed #17641 - map mobile number via SCIM 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 11:41:02 +01:00
snipe 6811ebcd52 Merge remote-tracking branch 'origin/develop' 2025-08-19 10:12:56 +01:00
snipe 7f9939a896 Merge pull request #17638 from Godmartinz/asset-tag-added-to-subject-line 
Adds asset tag to subject line of check in check out
 2025-08-19 09:36:25 +01:00
Godfrey M 1c99f2dfdd readd doesntorequireacceptance() to test 2025-08-18 10:52:35 -07:00
Godfrey M 1974fccac3 add tag to other notification test 2025-08-18 10:48:39 -07:00
Godfrey M 911552035e fix other test 2025-08-18 10:39:10 -07:00
Godfrey M ff25d275ee fix tests 2025-08-18 10:31:03 -07:00
Godfrey M 1fcf5e03e7 adds asset tag to subject line of checkin/out 2025-08-18 10:16:47 -07:00
snipe 4fe7bfb851 Merge remote-tracking branch 'origin/develop' 2025-08-18 15:24:25 +01:00
snipe 9b4101855f Undo double-float 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-18 15:24:15 +01:00
snipe 9253d894d3 Removed XSS-Protection header 
@see https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/X-XSS-Protection#security_considerations

Signed-off-by: snipe <snipe@snipe.net>
 2025-08-18 13:30:53 +01:00
snipe fb60985d03 Merge remote-tracking branch 'origin/develop' 2025-08-18 12:47:19 +01:00
snipe ebd79f22c7 Merge pull request #17636 from grokability/#17627-custom-fields-sorting 
Fixed #17627: custom fields not sorting correctly
 2025-08-18 12:47:03 +01:00