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

3756 Commits

Author SHA1 Message Date
Brady Wetherington e74460aefc Merge branch 'develop' into improve_ldap_certifcate_ignoring 2025-08-26 15:01:11 +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 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 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 8b83584b67 Added mapping fields to LDAP 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 18:31:58 +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 61abb8d5cb Fixed hardware.bulkedit redirect 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-18 09:45:02 +01:00
snipe 2bc144354a Use translations and more standard error bag 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-17 13:30:43 +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
snipe 01dd07083e Merge pull request #17584 from spencerrlongg/bug/17312-custom-field-checkbox-will-not-clear-if-no-checkboxes-should-be-selected 
Fixed #17312 - Fix Nulling Checkboxes
 2025-08-15 14:35:37 +02:00
snipe 42a28ea06b Merge pull request #17593 from Godmartinz/add-admin-to-acceptance-emails 
FIXED #17380 Adds Admin name to acceptance emails
 2025-08-15 14:33:02 +02:00
Godfrey M dfe2a75d72 adds user that checked out item to acceptance emails 2025-08-12 15:34:46 -07:00
spencerrlongg 817530429b added condition to make sure the request has checkbox 2025-08-12 14:52:52 -05:00
Marcus Moore 4a7b7183d2 Add custom_fields. prefix so custom fields can be filtered against 2025-08-11 14:58:41 -07:00
snipe ff91be491d Added mobile to tests 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-11 18:43:37 +01: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 bf2120fb31 Use newer file path 2025-08-10 18:26:41 +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
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 651c51bb01 Remove unused statements 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 10:41:46 +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
snipe 8d2643696b Deleted unused user file controller 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-08 12:55:59 +01:00
snipe e7488d19e9 Fixed name for uploaded files controller 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-08 12:55:48 +01:00
snipe 2bb3b6d64c Fixed prefixes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-08 12:55:24 +01:00
snipe 906741d662 Bumped debug to warning 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-08 11:32:04 +01:00
snipe 12be088c4f Merge pull request #17523 from Godmartinz/fix-create-new-rediret 
Fixes #17457 Previous Page redirect option
 2025-08-08 09:50:40 +01:00
snipe 09e82377a5 Merge pull request #17520 from marcusmoore/missing-user-redirect-fix 
Fixed potential failure in license checkin due to redirect option
 2025-08-08 09:48:43 +01:00
Marcus Moore c95aeb3730 Filter out unallowed columns (custom fields) 2025-08-07 17:25:20 -07:00
snipe 5c2dbe438b Added maintenances 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-07 18:23:57 +01:00
snipe 10857635ac Removed unused use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-07 18:23:44 +01:00
snipe f6ff729316 Added new generic files upload controller 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-07 18:22:57 +01:00
snipe 38678803eb Removed unused controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-07 18:22:45 +01:00
Герхард PICCORO Lenz McKAY f4be5ffb5d Fix workaround for #17491 log error on failed response for mail sending 
* Part of bunch of fixes, this fix #17491 where admins at test install cannot see the log of errors for UI test mail button, we can just see that this is the correct form cos other parts of the code manage the exception inside the catch using log interface class
 2025-08-07 11:42:17 -04:00