
commit147fcfb8eb
Merge:58a3d09b5
fdcc17ca2
Author: snipe <snipe@snipe.net> Date: Tue Oct 22 15:12:55 2024 +0100 Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs Fix user creation with FullMultipleCompanySupport enabled over API commit58a3d09b5f
Merge:30a06a594
867fa2f36
Author: snipe <snipe@snipe.net> Date: Tue Oct 22 14:55:42 2024 +0100 Merge pull request #15703 from marcusmoore/bug/sc-27188 Linked accessory files in activity report commit30a06a5942
Merge:6c6af78e0
ce3086317
Author: snipe <snipe@snipe.net> Date: Tue Oct 22 11:47:06 2024 +0100 Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing Removed brianium/paratest commit6c6af78e08
Merge:9b06bbb6c
3f79fd7ea
Author: snipe <snipe@snipe.net> Date: Tue Oct 22 11:46:04 2024 +0100 Merge pull request #15705 from marcusmoore/tests/icon-component-test Added test to ensure icon component does not end in newline commit3f79fd7ea7
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 17:07:40 2024 -0700 Add test to ensure icon component does not end in newline commit9b06bbb6c3
Merge:46ad1d072
d7f70146f
Author: snipe <snipe@snipe.net> Date: Mon Oct 21 22:38:26 2024 +0100 Merge pull request #15704 from marcusmoore/bug/remove-extra-icon Removed second icon in accessory file list commitce30863177
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 13:57:04 2024 -0700 Remove brianium/paratest dependency commitd7f70146f4
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 13:48:25 2024 -0700 Remove extra icon in accessory file upload list commit867fa2f36e
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 12:40:24 2024 -0700 Display file in activity report for accessories commit0933a2d4ea
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 17 18:01:48 2024 -0700 Remove --parallel flag commit46ad1d072f
Merge:bcb4bd9eb
3cf746d7d
Author: snipe <snipe@snipe.net> Date: Thu Oct 17 15:29:47 2024 +0100 Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions Bulk checkout to bulk actions commitbcb4bd9eb4
Merge:250037540
f50ccbcc4
Author: snipe <snipe@snipe.net> Date: Thu Oct 17 10:20:13 2024 +0100 Merge pull request #15683 from Toreg87/fixes/outdated_comment Fix outdated comment in CompanyableTrait commitf50ccbcc49
Author: Tobias Regnery <tobias.regnery@gmail.com> Date: Thu Oct 17 11:07:28 2024 +0200 Fix outdated comment in CompanyableTrait As of commit5800e8d
the user model uses CompanyableTrait so remove this clearly outdated comment commit3cf746d7df
Author: Brady Wetherington <bwetherington@grokability.com> Date: Wed Oct 16 23:13:32 2024 +0100 Rework the bulk checkout to not change how all checkouts work commit6b7af802af
Author: Brady Wetherington <bwetherington@grokability.com> Date: Thu Oct 10 13:28:23 2024 +0100 Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar commitfdcc17ca2c
Author: Tobias Regnery <tobias.regnery@gmail.com> Date: Wed Oct 16 11:18:24 2024 +0200 Fix user creation with FullMultipleCompanySupport enabled over API It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled. Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed. Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled. Signed-off-by: snipe <snipe@snipe.net>
101 lines
4.8 KiB
PHP
101 lines
4.8 KiB
PHP
<?php
|
|
|
|
return [
|
|
|
|
'undeployable' => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
|
|
'does_not_exist' => 'Asset does not exist.',
|
|
'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
|
|
'no_tag' => 'No asset tag provided.',
|
|
'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
|
|
'assoc_users' => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
|
|
'warning_audit_date_mismatch' => 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
|
|
|
|
'create' => [
|
|
'error' => 'Asset was not created, please try again. :(',
|
|
'success' => 'Asset created successfully. :)',
|
|
'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
|
|
],
|
|
|
|
'update' => [
|
|
'error' => 'Asset was not updated, please try again',
|
|
'success' => 'Asset updated successfully.',
|
|
'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
|
|
'nothing_updated' => 'No fields were selected, so nothing was updated.',
|
|
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
|
|
'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
|
|
],
|
|
|
|
'restore' => [
|
|
'error' => 'Asset was not restored, please try again',
|
|
'success' => 'Asset restored successfully.',
|
|
'bulk_success' => 'Asset restored successfully.',
|
|
'nothing_updated' => 'No assets were selected, so nothing was restored.',
|
|
],
|
|
|
|
'audit' => [
|
|
'error' => 'Asset audit unsuccessful: :error ',
|
|
'success' => 'Asset audit successfully logged.',
|
|
],
|
|
|
|
|
|
'deletefile' => [
|
|
'error' => 'File not deleted. Please try again.',
|
|
'success' => 'File successfully deleted.',
|
|
],
|
|
|
|
'upload' => [
|
|
'error' => 'File(s) not uploaded. Please try again.',
|
|
'success' => 'File(s) successfully uploaded.',
|
|
'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
|
|
'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
|
|
],
|
|
|
|
'import' => [
|
|
'import_button' => 'Process Import',
|
|
'error' => 'Some items did not import correctly.',
|
|
'errorDetail' => 'The following Items were not imported because of errors.',
|
|
'success' => 'Your file has been imported',
|
|
'file_delete_success' => 'Your file has been been successfully deleted',
|
|
'file_delete_error' => 'The file was unable to be deleted',
|
|
'file_missing' => 'The file selected is missing',
|
|
'file_already_deleted' => 'The file selected was already deleted',
|
|
'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
|
|
'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
|
|
],
|
|
|
|
|
|
'delete' => [
|
|
'confirm' => 'Are you sure you wish to delete this asset?',
|
|
'error' => 'There was an issue deleting the asset. Please try again.',
|
|
'nothing_updated' => 'No assets were selected, so nothing was deleted.',
|
|
'success' => 'The asset was deleted successfully.',
|
|
],
|
|
|
|
'checkout' => [
|
|
'error' => 'Asset was not checked out, please try again',
|
|
'success' => 'Asset checked out successfully.',
|
|
'user_does_not_exist' => 'That user is invalid. Please try again.',
|
|
'not_available' => 'That asset is not available for checkout!',
|
|
'no_assets_selected' => 'You must select at least one asset from the list',
|
|
],
|
|
|
|
'multi-checkout' => [
|
|
'error' => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
|
|
'success' => 'Asset checked out successfully.|Assets checked out successfully.',
|
|
],
|
|
|
|
'checkin' => [
|
|
'error' => 'Asset was not checked in, please try again',
|
|
'success' => 'Asset checked in successfully.',
|
|
'user_does_not_exist' => 'That user is invalid. Please try again.',
|
|
'already_checked_in' => 'That asset is already checked in.',
|
|
|
|
],
|
|
|
|
'requests' => [
|
|
'error' => 'Asset was not requested, please try again',
|
|
'success' => 'Asset requested successfully.',
|
|
'canceled' => 'Checkout request successfully canceled',
|
|
],
|
|
|
|
];
|