 snipe
|
b1359c3277
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
v8.3.0
|
2025-08-28 18:34:14 +01:00 |
|
|
snipe
|
9c0202e5ce
|
Bumped to 8.3.0
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 18:33:46 +01:00 |
|
|
snipe
|
39ef353073
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 18:32:07 +01:00 |
|
|
snipe
|
0ba8f5cc5a
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-28 18:06:29 +01:00 |
|
|
snipe
|
d1129081df
|
Asset nothing is sent if send_welcome is not checked/passed
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 18:05:40 +01:00 |
|
|
snipe
|
315a812df5
|
Fixed typos
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 16:41:56 +01:00 |
|
|
snipe
|
6fb9e2c38e
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-28 16:12:18 +01:00 |
|
|
snipe
|
cfc979acf0
|
Merge pull request #17432 from oolivero45/patch-1
Fixed #17431: EULA not displaying on asset acceptance page
|
2025-08-28 16:09:36 +01:00 |
|
|
snipe
|
d7407d70a3
|
Merge pull request #17741 from grokability/improved-user-create-tests
Improved user create tests
|
2025-08-28 13:32:46 +01:00 |
|
|
snipe
|
8ccd2e97a8
|
Improved user create tests
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 13:27:08 +01:00 |
|
|
snipe
|
988204619f
|
Merge pull request #17740 from grokability/renamed-user-test
Renamed the test for consistency
|
2025-08-28 13:05:05 +01:00 |
|
|
snipe
|
cad6cc3007
|
Renamed the test for consistency
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 13:02:01 +01:00 |
|
|
snipe
|
eebc2ab8be
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-28 07:30:15 +01:00 |
|
|
snipe
|
b303875f1d
|
Merge pull request #17734 from grokability/#17726-add-welcome-email-to-new-user-form
Fixed #17726: add welcome email to new user form
|
2025-08-28 07:29:56 +01:00 |
|
|
snipe
|
d5cc61f378
|
Added send to API call for creating users
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 07:28:51 +01:00 |
|
|
snipe
|
0d7ec43262
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 06:19:41 +01:00 |
|
|
snipe
|
d3747f4daa
|
Added welcome email to controller
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 06:12:01 +01:00 |
|
|
snipe
|
af695e7dc8
|
Added help to user importer
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 06:11:52 +01:00 |
|
|
snipe
|
1edbfd87df
|
Added welcome email checkbox to user create form
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 06:11:40 +01:00 |
|
|
snipe
|
454be01a6c
|
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 06:11:23 +01:00 |
|
|
snipe
|
b65b3151ee
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-28 05:29:48 +01:00 |
|
|
snipe
|
745fc515f1
|
Merge pull request #17713 from Godmartinz/fix-localization-for-email-notifications
Adds #5554 locale for acceptance notifications and checkin/out emails
|
2025-08-28 05:29:28 +01:00 |
|
|
snipe
|
715b9c1182
|
Merge pull request #17730 from Godmartinz/update-asset-accepance-with-category
Adds #9000 Item type to Account Asset Acceptance index
|
2025-08-28 05:22:54 +01:00 |
|
|
Godfrey M
|
95be847d87
|
renamed attribute
|
2025-08-27 14:10:51 -07:00 |
|
|
Godfrey M
|
c1a6546eba
|
change column header
|
2025-08-27 14:09:13 -07:00 |
|
|
Godfrey M
|
648c25a0a7
|
adds item type to Accept asset index
|
2025-08-27 14:06:10 -07:00 |
|
|
Godfrey M
|
f2ec7f2975
|
fix tests
|
2025-08-27 13:22:35 -07:00 |
|
|
Godfrey M
|
f518af6d61
|
fix class name
|
2025-08-27 13:09:05 -07:00 |
|
|
snipe
|
13a0f49f5f
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-27 16:36:05 +01:00 |
|
|
snipe
|
b11c6a5c06
|
Updated depreciation translation with more information.
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-27 16:35:49 +01:00 |
|
|
snipe
|
5822e4e692
|
Merge pull request #17729 from grokability/exit-early-if-ldap-troubleshooter-cannot-decrypt-ldap-pw
Put LDAP troubleshooter's decrypt in a try/catch to avoid crashing if it cannot decrypt the password
|
2025-08-27 15:47:22 +01:00 |
|
|
snipe
|
e4f06b0ca8
|
One last time
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-27 15:43:48 +01:00 |
|
|
snipe
|
2f093c0e82
|
Added early exist on step 4 as well
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-27 15:41:39 +01:00 |
|
|
snipe
|
5d9dc0e74d
|
Put decrypt in a try/catch
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-27 15:33:26 +01:00 |
|
|
snipe
|
199eefafa1
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-27 14:38:47 +01:00 |
|
|
snipe
|
adc3a34929
|
Fixed copy for encrypted custom fields
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-27 14:38:36 +01:00 |
|
|
snipe
|
cb2ffe6b3f
|
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-27 14:02:39 +01:00 |
|
|
snipe
|
c5b58f9ecc
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-27 13:32:25 +01:00 |
|
|
snipe
|
b3e3d01672
|
Fixed LDAP icon spacing
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-27 13:32:02 +01:00 |
|
|
snipe
|
6b68fe4de6
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-27 13:30:19 +01:00 |
|
|
snipe
|
4a6520fc78
|
Fixed address field
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-27 13:30:07 +01: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 |
|
|
snipe
|
2f77fcb526
|
Merge pull request #17724 from Godmartinz/checkout2location_email_fix
Fixes #17642 Checkouts to location email for Assets and Accessories
|
2025-08-27 13:02:57 +01:00 |
|
|
snipe
|
3461bbfdb3
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/app.css.map
# public/css/build/overrides.css
# public/css/build/overrides.css.map
# public/css/dist/all.css
# public/mix-manifest.json
|
2025-08-27 12:28:22 +01:00 |
|
|
Brady Wetherington
|
60604c3481
|
With the new SSL stuff, we are calling ldap_set_option() one more time now
|
2025-08-27 12:25:39 +01:00 |
|
|
Godfrey M
|
671c113cd2
|
add coma to translation"
|
2025-08-26 16:07:04 -07:00 |
|
|
Godfrey M
|
8a74d21ede
|
fixes checkout emails to location for assets and accessories"
|
2025-08-26 16:00:26 -07:00 |
|
|
Godfrey M
|
75995b2109
|
fix checkout to location email
|
2025-08-26 15:34:38 -07:00 |
|
|
snipe
|
d1eefc3fea
|
Merge pull request #17692 from grokability/#17387-make-saml-key-size-an-env
Fixed #17386 - Added SAML key size to env - possible alternative to #17387
|
2025-08-26 16:28:27 +01:00 |
|
|
Brady Wetherington
|
16795382fc
|
Many cleanups to default-mode of LDAP troubleshooter
|
2025-08-26 15:53:18 +01:00 |
|