3eca3ecd75
Merge remote-tracking branch 'origin/develop'
2025-04-09 21:31:41 +01:00
0d6a83197a
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2025-04-09 21:29:31 +01:00
6d784e36d7
Updated language
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 21:29:27 +01:00
9c88aa6974
Merge pull request #16637 from akemidx/lastnameemail
...
Fixed #8188 - Added Last Name as an email format
2025-04-09 21:27:10 +01:00
1307146831
changing where translations live. coalescing
2025-04-09 16:21:48 -04:00
1b7486c342
Merge pull request #16674 from spencerrlongg/bug/allow-avif-restore-and-logo
...
Add Support for Uploading AVIF Logo Images
2025-04-09 17:46:53 +01:00
cd9ee8af90
Add support for AVIF logo uploads and restoring avifs from public uploads
...
Extended the list of allowed file extensions and MIME types to include AVIF format in both backend file validation and the file input field for logo uploads. This update ensures compatibility with modern image formats.
2025-04-09 11:36:16 -05:00
cbf4fef45b
Merge pull request #16671 from snipe/fixed_list_view_of_asset_files
...
Partial fix for #16135 - normalized asset file listing at API endpoint
2025-04-09 06:45:32 +01:00
8892a11e7e
Updated tests
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 06:40:14 +01:00
fc390dd107
Merge pull request #16672 from snipe/added_missing_gate_to_some_location_methods
...
Added gates to printing locations
2025-04-09 06:28:38 +01:00
99dfb51d70
Fixed test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 06:23:40 +01:00
04f8ebb4d8
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 06:17:08 +01:00
41fb058adb
Added gates around printing location assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 06:06:44 +01:00
f29146b319
Fixed asset file listing display at API endpoint
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 05:53:24 +01:00
ce0bd68716
RMB for file routes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 05:52:59 +01:00
f3f26b3824
Added UploadedFilesTransformer
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 05:52:48 +01:00
7be3d6072f
Removed erroneous comment
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 05:52:35 +01:00
1d030b59df
Merge pull request #16592 from fvollmer/anonymous-ldap
...
Improve Settings: Remove username and password requirement for ldap
2025-04-09 05:19:09 +01:00
140c6b91b0
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2025-04-09 02:40:28 +01:00
07d2d8c549
Merge pull request #16669 from snipe/translations_for_skins
...
Fixed #16130 - Added translations for skins, other settings
2025-04-09 02:37:17 +01:00
691ccbbebc
Additional branding placeholders
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 02:32:22 +01:00
9daa09277d
Added translations for skins
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 02:23:18 +01:00
79eaf62c9e
Merge pull request #16668 from spencerrlongg/bug/sc-28768
...
Handle Potentially Unsafe File Output Better During Restore
2025-04-09 01:01:59 +01:00
dd078785ac
always show unsafe files
2025-04-08 18:06:18 -05:00
12a8c54331
Handle and log skipped unsafe files during restore
...
Introduced a mechanism to track and log potentially unsafe files skipped during the restore process. These files are collected in an array and displayed as warnings before exiting, improving transparency and debugging capability.
2025-04-08 16:43:36 -05:00
9f04254963
Merge pull request #16666 from snipe/print_view_tweaks
...
Added signature to licenses in print view, misc other fixes
2025-04-08 19:34:02 +01:00
10b8055b29
Added monospace class
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 19:10:16 +01:00
2b85ddeb74
Use correct date
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 19:10:06 +01:00
9017ae8545
Added category to consumable checkout
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 19:09:58 +01:00
d0359a42fb
Added signature to licenses
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 18:56:34 +01:00
7701c6097f
adding username split
2025-04-08 13:21:32 -04:00
275e1beda2
updating for conflicts and adding test
2025-04-08 13:15:28 -04:00
f659b7631d
Merge branch 'develop' into lastnameemail
2025-04-08 13:10:26 -04:00
e0c6483b43
Merge pull request #16660 from snipe/cleanup_for_scoped_locations
...
Small improvements to location-by-company scoping
2025-04-08 17:57:50 +01:00
c2e12f69d8
Merge pull request #16664 from 36864/patch-1
...
Fixes #16661 : Empty signatures in print page
2025-04-08 17:57:11 +01:00
890702f66d
A few more display tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 17:47:39 +01:00
dfdbc95b5c
Fix empty signatures in print page
...
Fixes snipe#16661
Assuming that whatever happens between the user accepting and signing for the asset and the print page being accessed isn't another user somehow signing for the same asset and it not being assigned to that second user.
2025-04-08 15:50:59 +00:00
ea365e5645
More fields visible
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 16:17:57 +01:00
548ae49c69
Small tweaks to table
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 15:30:07 +01:00
34f8f50a4a
Use localization, turned display into table
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 15:13:57 +01:00
da2c760227
Renamed variables, skipped breaking out of loop
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 15:13:19 +01:00
a96abeac5f
Use localization w/trans_choice
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 15:12:58 +01:00
420278c63b
Nicer layout for settings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 15:12:36 +01:00
e0a04fe1ce
Localized message
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 15:12:19 +01:00
c42f53e846
Use table layout
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 12:34:11 +01:00
44ee287cc0
Nicer formatting
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 12:34:00 +01:00
a56f6148fc
Improve Settings: Remove username and password requirement for ldap
...
Since 9d62793
2025-04-08 11:04:37 +02:00
5b1d6dbe14
Merge pull request #12577 from Toreg87/feature/locations_with_companies
...
Added #2353 : Add ability to tie locations to companies - 2023 edition
2025-04-08 09:54:37 +01:00
43c15ef134
Merge branch 'develop' into feature/locations_with_companies
2025-04-08 09:18:48 +01:00
a5315ec240
Merge remote-tracking branch 'origin/develop'
2025-04-08 08:32:25 +01:00
snipe