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

1608 Commits

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
Brady Wetherington 15e64155b5 Add version checking to LDAP troubleshooter, clean up ldap model 2025-08-26 13:57:25 +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
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 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 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 9c06ff3899 Check for numeric 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-20 11:00:18 +01:00
snipe 2d6270c697 Updated validation, switch to string() as db field type 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 19:19:29 +01: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
snipe 4b8c371097 Updated true to false 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 12:59:28 +01:00
snipe 0c3103e3d2 Modify the getter 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 12:56:30 +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 f6c64abc1a Fixed #17641 - map mobile number via SCIM 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 11:41:02 +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 ea84728a3f Rename models uploads dir 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 17:58:11 +01:00
snipe d14b34141c Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 15:53:53 +01:00
snipe 14bc2cc1ba Added basic logging for maintenances 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 15:51:48 +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 205725c767 Renamed model 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 12:30:50 +01:00
snipe a5e37519f5 Merge pull request #17539 from grokability/add-file-uploads-to-maintenances 
WIP: Add file uploads to maintenances
 2025-08-10 11:13:19 +01:00
snipe 5744e48ae8 Added getDisplayNameAttribute() to maintenances 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-08 12:54:36 +01:00
snipe 82d0a21440 Added to actionlog model 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-08 12:54:09 +01:00
snipe 58133cffac Updated maintenance model 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-08 12:37:03 +01:00
Marcus Moore b8fe3b18d4 Add "string" to serial rules for asset 2025-08-07 12:27:48 -07:00
snipe ec828318d8 Merge pull request #17417 from marcusmoore/snipe-it-17073-asset-requests-are-not-deleted-when-asset-is-deleted 
Fixed #17073 - delete old checkout requests
 2025-08-07 18:32:13 +01:00
snipe d31e7ed534 Use new route 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-07 18:24:02 +01:00
snipe 8516856d37 Merge pull request #17456 from spencerrlongg/9511-validation-always-fails-on-encrypted-custom-fields 
Fixed #9511 - Validation For Encrypted Custom Fields
 2025-08-05 17:45:38 +01:00
Marcus Moore ff39e8bd2c Merge branch 'develop' into snipe-it-17073-asset-requests-are-not-deleted-when-asset-is-deleted 2025-08-04 12:43:03 -07:00
snipe 5e8cc66f5c Added scope for admins and superadmins 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 18:45:07 +01:00
snipe afa3dacc31 Check if it’s an accepted/declined file 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-31 13:21:22 +01:00
snipe fbb36d1665 Fixed file routes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-28 23:32:45 +01:00
spencerrlongg 8a40d7e35c tests added, regex validation working 2025-07-23 16:12:19 -05:00
snipe b13e74756a Fixed #17316 - handle checkboxes correctly in checkin/checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-23 14:51:34 +01:00
snipe 8d2a5a7e4a Added location and defaultLoc to searchable relations in audit log 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-23 12:28:23 +01:00
snipe 2eaaeb8259 Merge pull request #17423 from grokability/tighter-permissions-on-non-admins 
Tighter permissions on non-admins and demo modes
 2025-07-22 14:32:50 +01:00
snipe cd9f8be563 Optimize for when we already have the counts 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-22 13:25:16 +01:00
spencerrlongg e9948f0718 fixes booleans, adds note, changes name 2025-07-21 15:34:08 -05:00
spencerrlongg 2f74a8afe1 mac address rule working 2025-07-21 12:02:45 -05:00
snipe 9dd4bc5fa8 Merge pull request #17391 from Godmartinz/add-components-notifications 
FIXED: #13844 Adds Webhook and Mail Notifications for Components
 2025-07-21 11:51:30 +01:00
snipe a98d3fb4dc Check for the format of the permissions (string, object, array) 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-17 20:09:17 +01:00