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

19157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brady Wetherington e74460aefc Merge branch 'develop' into improve_ldap_certifcate_ignoring 2025-08-26 15:01:11 +01:00
Brady Wetherington 55a5a12b30 Formalize the 'double-barrel' method of setting TLS cert ignores 2025-08-26 15:00:33 +01:00
snipe 17650c5735 Changed field title 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-26 14:03:11 +01:00
Brady Wetherington 15e64155b5 Add version checking to LDAP troubleshooter, clean up ldap model 2025-08-26 13:57:25 +01:00
snipe 39955ac760 Add @akaspeh1 as a contributor 2025-08-26 12:42:20 +01:00
snipe 855a176ca9 Add @nickwest as a contributor 2025-08-26 12:42:15 +01:00
snipe 47b2b30455 Merge pull request #17710 from akaspeh1/develop 
Adds support for label sheets Avery L4736 & L6009
 2025-08-26 12:42:02 +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 a6b74d56c6 Merge pull request #17709 from grokability/add-display-name-to-users-fixed 
Added display name to users for LDAP/SCIM, added new sync fields (replaced #17650)
 2025-08-26 12:39:25 +01:00
snipe a4222bcaef Merge pull request #17711 from grokability/dependabot/github_actions/develop/actions/checkout-5 
Bump actions/checkout from 4 to 5
 2025-08-26 12:10:24 +01:00
snipe ecf24511cd Fixed tests for real this time tho 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-26 12:09:55 +01:00
snipe abb097a391 Merge pull request #17714 from Godmartinz/Audit_null_fix 
Added null checks to MS Teams Audit notification
 2025-08-26 10:44:51 +01:00
Godfrey M dd742a2e4a add a check for audit notification variables in MS Teams and a translation 2025-08-25 15:10:41 -07:00
dependabot[bot] 73ac00bc51 Bump actions/checkout from 4 to 5 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-08-25 16:25:39 +00:00
snipe 3524e23e38 Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-25 17:17:45 +01:00
Jakub Aqaba Štarman be0f3910bb Fixed: Old computation 2025-08-25 16:57:32 +02: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
Jakub Aqaba Štarman 5a16b59462 Adds support for label sheets Avery L4736 & L6009 2025-08-25 16:47:52 +02:00
Brady Wetherington 13cd7071b8 WIP improving some LDAP stuff 2025-08-25 15:41:01 +01:00
snipe 40108b196c Trying to fix import tests :( 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-25 15:28:43 +01:00
snipe c8e79aa5ca Merge branch 'develop' into add-display-name-to-users-fixed 2025-08-25 15:28:20 +01:00
snipe e60f2b2332 Tightened up accessor code for better inheritence 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-25 15:00:10 +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 29a18c7c8b Merge pull request #17696 from uberbrady/add_created_at_index_to_models 
Fixed [FD-49550] - added a 'created_at' index to the models table
 2025-08-21 14:54:20 +01:00
Brady Wetherington 6db0003e3f Adds a 'created_at' index to the models table 2025-08-21 13:44:14 +01:00
snipe c538c460fa Merge pull request #17695 from grokability/#17482-better-localization-indates-on-asset-view 
Use nicer local for purchase date
 2025-08-21 13:13:26 +01:00
snipe 822339fe42 Moved warning 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-21 13:13:11 +01:00
snipe b84d9282ca Use normal locale for warranty 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-21 13:05:01 +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 fc091c1174 Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-21 09:29:12 +01:00
snipe c07ef4d87f A few small tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-21 09:25:42 +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 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 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 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 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 bf591320af Fixed #17665 - delete custom report modal 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-20 09:58:30 +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 07b25fe376 Add display name to summary 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 20:52:18 +01:00
snipe c2ecd20b7d Updated field text 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 20:47:48 +01:00