 spencerrlongg
|
1d24b7985b
|
another translation change
|
2025-08-27 17:25:17 -05:00 |
|
|
spencerrlongg
|
526bb2c650
|
more translation changes
|
2025-08-27 17:23:46 -05:00 |
|
|
spencerrlongg
|
c450c0ddb8
|
lots of translation changes
|
2025-08-27 17:17:18 -05:00 |
|
|
Godfrey M
|
f518af6d61
|
fix class name
|
2025-08-27 13:09:05 -07:00 |
|
|
snipe
|
75ab6c9b13
|
Merge pull request #17723 from uberbrady/improve_ldap_certificate_ignoring
Improve ldap certificate ignoring
|
2025-08-27 13:29:33 +01:00 |
|
|
Marcus Moore
|
4298aad008
|
Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold
# Conflicts:
# app/Http/Controllers/Account/AcceptanceController.php
# resources/views/notifications/markdown/asset-acceptance.blade.php
|
2025-08-26 11:39:52 -07:00 |
|
|
snipe
|
264efb015e
|
Fixed jobtitle field mapping
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-26 15:05:05 +01:00 |
|
|
Brady Wetherington
|
e74460aefc
|
Merge branch 'develop' into improve_ldap_certifcate_ignoring
|
2025-08-26 15:01:11 +01:00 |
|
|
snipe
|
469e3bd475
|
Nicer ldap preview layout, show all mapped fields
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-26 14:51:34 +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 |
|
|
spencerrlongg
|
1d88cf443f
|
revert SuppliersController as well
|
2025-08-25 18:45:31 -05:00 |
|
|
spencerrlongg
|
7b6c0c3a40
|
Revert "tests passing, needs some manual testing"
This reverts commit fdb0651bf4.
|
2025-08-25 18:42:11 -05:00 |
|
|
spencerrlongg
|
fdb0651bf4
|
tests passing, needs some manual testing
|
2025-08-25 18:25:36 -05:00 |
|
|
Godfrey M
|
128bdf500a
|
sends an email for to locale and cc locale
|
2025-08-25 12:02:23 -07: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 |
|
|
Marcus Moore
|
7c58bfa282
|
Add qty to AcceptanceAssetDeclinedNotification
|
2025-08-21 14:56:24 -07:00 |
|
|
Marcus Moore
|
c22575812d
|
Add qty to AcceptanceAssetAcceptedToUserNotification
|
2025-08-21 14:53:00 -07: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 |
|
|
spencerrlongg
|
643d44af22
|
change \Throwable to \Exceptionm, add missing report()s
|
2025-08-20 23:09:59 -05:00 |
|
|
spencerrlongg
|
b934f43db0
|
rename all exceptions
|
2025-08-20 22:58:39 -05:00 |
|
|
Marcus Moore
|
27f02014ca
|
Add failing test
|
2025-08-20 12:26:55 -07:00 |
|
|
Marcus Moore
|
39d5ffeceb
|
Implement fix
|
2025-08-20 12:05:58 -07: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 |
|
|
spencerrlongg
|
e33b1b6c90
|
fixed maintenances
|
2025-08-12 13:34:40 -05:00 |
|
|
Spencer Long
|
30520297e8
|
Merge branch 'develop' into feature/8709-bulk-deletion-of-asset-categories-suppliers-manufacturers
|
2025-08-12 11:58:11 -06:00 |
|
|
spencerrlongg
|
78ca1d1335
|
some cleanup
|
2025-08-11 21:07:08 -05:00 |
|
|
spencerrlongg
|
6159ee8c2c
|
category done!
|
2025-08-11 20:16:43 -05:00 |
|
|
spencerrlongg
|
5cd5392958
|
manufacturer completed, just categories left
|
2025-08-11 19:42:09 -05:00 |
|
|
spencerrlongg
|
d0e068f1c0
|
suppliers completely done, rinse and repeat for the other two
|
2025-08-11 19:04:36 -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 |
|