snipe
|
8a44144c20
|
Merge pull request #16954 from grokability/develop
Merge dev into master
|
2025-05-16 11:16:14 +02:00 |
|
snipe
|
186f322bb5
|
Merge pull request #16953 from uberbrady/fix_checkin_emails
Make checkin emails not send when not configured to be
|
2025-05-16 11:14:31 +02:00 |
|
Brady Wetherington
|
28e2e7c924
|
Get rid of more editorialization
|
2025-05-16 10:57:34 +02:00 |
|
Brady Wetherington
|
97351028b5
|
Get rid of editorializing in comments
|
2025-05-16 10:56:36 +02:00 |
|
Brady Wetherington
|
0ef0863b59
|
Make checkin emails not send unless the send-emails attribute is set on the category
|
2025-05-16 10:48:17 +02:00 |
|
snipe
|
ca66e29072
|
Merge pull request #16946 from marcusmoore/bug/sc-29166
Gracefully handle error when editing of soft deleted users
|
2025-05-15 22:46:48 +02:00 |
|
Marcus Moore
|
9600adee6b
|
Don't allow viewing edit page if user soft deleted
|
2025-05-15 11:14:15 -07:00 |
|
snipe
|
ee82c70582
|
Merge remote-tracking branch 'origin/develop'
|
2025-05-15 18:32:05 +02:00 |
|
snipe
|
6eb3819492
|
Apply correct unique custom field validation for audit API
Signed-off-by: snipe <snipe@snipe.net>
|
2025-05-15 18:31:49 +02:00 |
|
snipe
|
c87e8e606b
|
Merge remote-tracking branch 'origin/develop'
|
2025-05-15 18:02:47 +02:00 |
|
snipe
|
95226f87bc
|
Use same logic for auditStore for validating unique fields
Signed-off-by: snipe <snipe@snipe.net>
|
2025-05-15 18:02:23 +02:00 |
|
snipe
|
37a50dd953
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2025-05-15 17:51:54 +02:00 |
|
snipe
|
ee3ae803b9
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2025-05-15 17:51:28 +02:00 |
|
snipe
|
a2669a3084
|
Removed temp code
Signed-off-by: snipe <snipe@snipe.net>
|
2025-05-15 17:31:16 +02:00 |
|
snipe
|
77da22f4dd
|
Print errors if they exist (temp)
Signed-off-by: snipe <snipe@snipe.net>
|
2025-05-15 17:26:04 +02:00 |
|
snipe
|
7830ffe202
|
Temp echo errors
Signed-off-by: snipe <snipe@snipe.net>
|
2025-05-15 17:24:08 +02:00 |
|
snipe
|
1c9e20d59f
|
Merge remote-tracking branch 'origin/develop'
|
2025-05-15 17:10:57 +02:00 |
|
snipe
|
057667c425
|
Removed duplicate unique display in table
Signed-off-by: snipe <snipe@snipe.net>
|
2025-05-15 17:10:47 +02:00 |
|
Marcus Moore
|
f644642fac
|
Add comment
|
2025-05-14 12:48:32 -07:00 |
|
Marcus Moore
|
3374a9e5a9
|
Add assertion
|
2025-05-14 12:48:11 -07:00 |
|
Marcus Moore
|
d3a74a5740
|
Use route bound user instead of re-querying
|
2025-05-14 12:46:34 -07:00 |
|
Marcus Moore
|
c458cc904a
|
Add failing test
|
2025-05-14 12:45:55 -07:00 |
|
snipe
|
320edac286
|
Merge remote-tracking branch 'origin/develop'
|
2025-05-14 17:39:30 +02:00 |
|
snipe
|
5c7b74e17e
|
Merge pull request #16943 from grokability/small-tweaks-to-status-label-text
Clearer text on status label types
|
2025-05-14 17:35:40 +02:00 |
|
snipe
|
e07b0f65a1
|
Clearer text on status label types
Signed-off-by: snipe <snipe@snipe.net>
|
2025-05-14 17:33:12 +02:00 |
|
snipe
|
d49878371d
|
Merge remote-tracking branch 'origin/develop'
|
2025-05-14 16:23:38 +02:00 |
|
snipe
|
b06fd5bbca
|
Merge pull request #16942 from uberbrady/quick_temp_fix_notifications
A quick check to make sure that webhooks still fire when email is off
|
2025-05-14 16:21:37 +02:00 |
|
Brady Wetherington
|
6306f78fe0
|
A quick check to make sure that webhooks still fire when email is off
|
2025-05-14 16:14:03 +02:00 |
|
snipe
|
d2575a5d9b
|
Add @JassonCordones as a contributor
|
2025-05-14 15:03:04 +02:00 |
|
Marcus Moore
|
ea6cf72580
|
Formatting
|
2025-05-14 15:03:04 +02:00 |
|
Marcus Moore
|
2118155b37
|
Fix bug in getImageUrl method
|
2025-05-14 15:03:04 +02:00 |
|
Marcus Moore
|
ba4f5bb71f
|
Add test for existing functionality
|
2025-05-14 15:03:04 +02:00 |
|
Marcus Moore
|
d5a74a5a8b
|
Remove unneeded div
|
2025-05-14 15:03:04 +02:00 |
|
Marcus Moore
|
23be1df360
|
Remove the replaced locales form macro
|
2025-05-14 15:03:04 +02:00 |
|
Marcus Moore
|
b5c1a1da4c
|
Replace Form::locales on user setup
|
2025-05-14 15:03:04 +02:00 |
|
Marcus Moore
|
c11e784f51
|
Replace Form::locales on bulk edit users page
|
2025-05-14 15:03:04 +02:00 |
|
Marcus Moore
|
06f51c8f9c
|
Replace Form::locales on user edit page
|
2025-05-14 15:03:04 +02:00 |
|
Marcus Moore
|
181bcbbda6
|
Replace Form::locales on localization page
|
2025-05-14 15:03:04 +02:00 |
|
Marcus Moore
|
d008ead6a4
|
Fix input name
|
2025-05-14 15:03:04 +02:00 |
|
Marcus Moore
|
75924be958
|
Introduce locale select component and make replacement on profile page
|
2025-05-14 15:03:04 +02:00 |
|
snipe
|
da4bce0c89
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2025-05-14 15:02:43 +02:00 |
|
snipe
|
053e815206
|
Add @JassonCordones as a contributor
|
2025-05-14 15:02:43 +02:00 |
|
snipe
|
b1a6e3f8a2
|
Merge pull request #16930 from JassonCordones/master
fix typo in snipeit.sh
|
2025-05-14 15:01:41 +02:00 |
|
snipe
|
ab1053ecda
|
Merge pull request #16916 from marcusmoore/bug/sc-29153
Handle potential hard exception in Asset@getImageUrl method
|
2025-05-14 14:52:33 +02:00 |
|
snipe
|
9a61a3391b
|
Merge pull request #16921 from marcusmoore/chore/locale-select
Replace locales macro
|
2025-05-14 14:52:02 +02:00 |
|
snipe
|
06712a6041
|
Merge remote-tracking branch 'origin/develop'
|
2025-05-14 13:42:51 +02:00 |
|
snipe
|
d3c19e28ec
|
Merge pull request #16918 from marcusmoore/bug/sc-29151
Handle displaying deleted creator of an accessory
|
2025-05-14 13:36:08 +02:00 |
|
snipe
|
87115f2e50
|
Merge branch 'develop' into bug/sc-29151
|
2025-05-14 13:35:38 +02:00 |
|
snipe
|
62b16339a9
|
Merge remote-tracking branch 'origin/develop'
|
2025-05-13 20:44:34 +02:00 |
|
snipe
|
6b56929a06
|
Null operator for missing created_by record
Signed-off-by: snipe <snipe@snipe.net>
|
2025-05-13 20:44:25 +02:00 |
|