c8e79aa5ca
Merge branch 'develop' into add-display-name-to-users-fixed
2025-08-25 15:28:20 +01:00
b6d397bcca
Updated ->present()->fullName() to ->display_name
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-25 14:57:34 +01:00
6503f9c667
Revert "Merge pull request #17650 from grokability/add-displayName-to-users"
...
This reverts commit 4770e469b429a18c7c8bsnipe@snipe.net >
2025-08-21 20:23:47 +01:00
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
c07ef4d87f
A few small tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-21 09:25:42 +01:00
11eee833bb
Fixed #17667 - Switch to hyphens for windows
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-20 15:56:10 +01:00
56e687bed2
Retuen the display name in the API call
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-20 09:33:00 +01:00
8b83584b67
Added mapping fields to LDAP
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-19 18:31:58 +01:00
1488271a83
Added #8522 - depreciation info on Asset API
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-19 14:48:48 +01:00
6a8e1566fe
Added display_name to a few more places
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-19 12:56:11 +01:00
ced30082a6
Added display_name as user field
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-19 12:10:28 +01:00
c1b139fb9a
Fixed #17627 : custom fields not sorting correctly
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-18 12:31:03 +01:00
61abb8d5cb
Fixed hardware.bulkedit redirect
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-18 09:45:02 +01:00
2bc144354a
Use translations and more standard error bag
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-17 13:30:43 +01:00
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
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
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
dfe2a75d72
adds user that checked out item to acceptance emails
2025-08-12 15:34:46 -07:00
817530429b
added condition to make sure the request has checkbox
2025-08-12 14:52:52 -05:00
4a7b7183d2
Add custom_fields. prefix so custom fields can be filtered against
2025-08-11 14:58:41 -07:00
ff91be491d
Added mobile to tests
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-11 18:43:37 +01:00
ef35a0f2f1
Fixed #10284 : Added mobile phone to users
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-11 18:38:22 +01:00
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
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
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
bf2120fb31
Use newer file path
2025-08-10 18:26:41 +01:00
ea84728a3f
Rename models uploads dir
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-10 17:58:11 +01:00
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
deb1afd28b
Few more replcamenents
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-10 14:14:21 +01:00
9e8eead71e
Renamed routes and method names
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-10 13:29:48 +01:00
ff25015595
Renamed more files
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-10 13:24:14 +01:00
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
651c51bb01
Remove unused statements
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-10 10:41:46 +01:00
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
8d2643696b
Deleted unused user file controller
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-08 12:55:59 +01:00
e7488d19e9
Fixed name for uploaded files controller
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-08 12:55:48 +01:00
2bb3b6d64c
Fixed prefixes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-08 12:55:24 +01:00
906741d662
Bumped debug to warning
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-08 11:32:04 +01:00
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
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
c95aeb3730
Filter out unallowed columns (custom fields)
2025-08-07 17:25:20 -07:00
5c2dbe438b
Added maintenances
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-07 18:23:57 +01:00
10857635ac
Removed unused use statement
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-07 18:23:44 +01:00
f6ff729316
Added new generic files upload controller
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-07 18:22:57 +01:00
38678803eb
Removed unused controllers
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-07 18:22:45 +01:00
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
19958748bf
Use image upload request
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-07 15:39:12 +01:00
8095e0ab72
Normalize consumables user response
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-06 16:25:51 +01:00
bd2acefecc
rethought, keeping previous page as an option
2025-08-05 12:29:59 -07:00
7abc3a7d7d
Only push to session if user exists
2025-08-05 10:57:07 -07:00
snipe