diff --git a/common/ASC.ActiveDirectory/Base/LdapNotifyHelper.cs b/common/ASC.ActiveDirectory/Base/LdapNotifyHelper.cs index 45bab92bc7..15c807bc63 100644 --- a/common/ASC.ActiveDirectory/Base/LdapNotifyHelper.cs +++ b/common/ASC.ActiveDirectory/Base/LdapNotifyHelper.cs @@ -33,19 +33,16 @@ public class LdapNotifyService : BackgroundService private readonly IServiceScopeFactory _serviceScopeFactory; private readonly WorkContext _workContext; private readonly LdapSaveSyncOperation _ldapSaveSyncOperation; - private readonly NotifyEngineQueue _notifyEngineQueue; public LdapNotifyService( IServiceScopeFactory serviceScopeFactory, WorkContext workContext, - LdapSaveSyncOperation ldapSaveSyncOperation, - NotifyEngineQueue notifyEngineQueue) + LdapSaveSyncOperation ldapSaveSyncOperation) { _clients = new ConcurrentDictionary>(); _serviceScopeFactory = serviceScopeFactory; _workContext = workContext; _ldapSaveSyncOperation = ldapSaveSyncOperation; - _notifyEngineQueue = notifyEngineQueue; } protected override Task ExecuteAsync(CancellationToken stoppingToken) @@ -82,10 +79,11 @@ public class LdapNotifyService : BackgroundService { if (!_clients.ContainsKey(tenant.Id)) { - using var scope = _serviceScopeFactory.CreateScope(); - var source = scope.ServiceProvider.GetRequiredService(); + var scope = _serviceScopeFactory.CreateScope(); + var source = scope.ServiceProvider.GetRequiredService(); + var notifyEngineQueue = scope.ServiceProvider.GetRequiredService(); source.Init(tenant); - var client = _workContext.NotifyContext.RegisterClient(_notifyEngineQueue, source); + var client = _workContext.NotifyContext.RegisterClient(notifyEngineQueue, source); _workContext.RegisterSendMethod(source.AutoSync, cron); _clients.TryAdd(tenant.Id, new Tuple(client, source)); } diff --git a/common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs b/common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs index 8206eedc23..2a087b86ee 100644 --- a/common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs +++ b/common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs @@ -664,7 +664,7 @@ public class NotifyEngine : INotifyEngine, IDisposable } } -[Singletone] +[Scope] public class NotifyEngineQueue { private readonly NotifyEngine _notifyEngine; diff --git a/web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs b/web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs index abae93ba86..cd62bab2b5 100644 --- a/web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs +++ b/web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs @@ -19,7 +19,7 @@ namespace ASC.Web.Core.PublicResources { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class CustomModeResource { @@ -81,14 +81,14 @@ namespace ASC.Web.Core.PublicResources { } /// - /// Looks up a localized string similar to h1.Welcome to ONLYOFFICE Personal - /// - ///You have just created your personal office in the cloud. - /// - ///h3.It's a virtual workspace where you can edit and store documents, work with them from anywhere providing access to your friends or colleagues. - /// + /// Looks up a localized string similar to h1.Welcome to ONLYOFFICE Personal + /// + ///You have just created your personal office in the cloud. + /// + ///h3.It's a virtual workspace where you can edit and store documents, work with them from anywhere providing access to your friends or colleagues. + /// ///h3.For a quick start, here's what you can do in ONLYOFFICE: - /// + /// ///- Create, view and edit text documents, spreadsheets, presentations. /// ///- Work with all popular formats. Highest compatibility with MS Office files. @@ -102,10 +102,10 @@ namespace ASC.Web.Core.PublicResources { } /// - /// Looks up a localized string similar to $PersonalHeaderStart Connect your favorite cloud storage to ONLYOFFICE $PersonalHeaderEnd - /// + /// Looks up a localized string similar to $PersonalHeaderStart Connect your favorite cloud storage to ONLYOFFICE $PersonalHeaderEnd + /// ///It has been a week since you created your cloud office, so we believe it's time to unveil some tips and recommendations on how to make your work even more effective. - /// + /// ///*Bring all your docs together* /// ///Connect Dropbox, Google Drive, Box, OneDrive, Nextcloud, ownCloud, kDrive, or Yandex.Disk to ONLYOFFICE and create a single document management space for all your documents. @@ -136,6 +136,21 @@ namespace ASC.Web.Core.PublicResources { } } + /// + /// Looks up a localized string similar to Want to change the password on your cloud office account? Click the button below to confirm. + /// + ///$GreenButton + /// + ///The link is valid for 7 days. + /// + ///Don’t want to change your password? Just ignore this message.. + /// + public static string pattern_personal_custom_mode_change_password_v115 { + get { + return ResourceManager.GetString("pattern_personal_custom_mode_change_password_v115", resourceCulture); + } + } + /// /// Looks up a localized string similar to Hello, /// @@ -153,12 +168,12 @@ namespace ASC.Web.Core.PublicResources { } /// - /// Looks up a localized string similar to You have requested a termination of your account at personal.onlyoffice.com. Follow the link to complete the request (the link is active for a 7-day period): - /// + /// Looks up a localized string similar to You have requested a termination of your account at personal.onlyoffice.com. Follow the link to complete the request (the link is active for a 7-day period): + /// ///Confirm account termination - /// + /// ///*Note*: After the deletion, your account and all data associated with it will be erased permanently in accordance with our "Privacy statement":"https://help.onlyoffice.com/products/files/doceditor.aspx?fileid=5048502&doc=SXhWMEVzSEYxNlVVaXJJeUVtS0kyYk14YWdXTEFUQmRWL250NllHNUFGbz0_IjUwNDg1MDIi0". - /// + /// ///"Read more about account [rest of string was truncated]";. /// public static string pattern_personal_custom_mode_profile_delete { @@ -168,14 +183,14 @@ namespace ASC.Web.Core.PublicResources { } /// - /// Looks up a localized string similar to Dear $UserName, - /// - ///The process of removing data from user "$FromUserName":"$FromUserLink" has been successfully completed. - /// - ///The deletion of personal data allowed to free: - /// - ///# Documents - $DocsSpace - ///# Mail - $MailSpace + /// Looks up a localized string similar to Dear $UserName, + /// + ///The process of removing data from user "$FromUserName":"$FromUserLink" has been successfully completed. + /// + ///The deletion of personal data allowed to free: + /// + ///# Documents - $DocsSpace + ///# Mail - $MailSpace ///# Talk - $TalkSpace. /// public static string pattern_remove_user_data_completed_custom_mode { diff --git a/web/ASC.Web.Core/PublicResources/CustomModeResource.resx b/web/ASC.Web.Core/PublicResources/CustomModeResource.resx index 2cd5c7a321..190cd78cef 100644 --- a/web/ASC.Web.Core/PublicResources/CustomModeResource.resx +++ b/web/ASC.Web.Core/PublicResources/CustomModeResource.resx @@ -1,5 +1,64 @@  + @@ -53,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Dear $UserName, @@ -153,6 +212,15 @@ The link is valid for 7 days. *If you are not signed in to your cloud office in this browser, you’ll need to use your old email for confirmation. Don’t want to change your email? Just ignore this message. + + + Want to change the password on your cloud office account? Click the button below to confirm. + +$GreenButton + +The link is valid for 7 days. + +Don’t want to change your password? Just ignore this message. Hello, diff --git a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs index 8a58b7b576..f7ef5adc0f 100644 --- a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs +++ b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs @@ -19,7 +19,7 @@ namespace ASC.Web.Core.PublicResources { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class WebstudioNotifyPatternResource { @@ -547,6 +547,23 @@ namespace ASC.Web.Core.PublicResources { } } + /// + /// Looks up a localized string similar to h1.Mobile phone change request + /// + ///You have requested to change your mobile phone used to enter the ${LetterLogoText} portal. + /// + ///Please follow the link below to change your mobile phone: + /// + ///$GreenButton + /// + ///If you do not want to change your mobile phone or received this email by mistake, please ignore it or contact your portal administrator to find out the details.. + /// + public static string pattern_change_phone { + get { + return ResourceManager.GetString("pattern_change_phone", resourceCulture); + } + } + /// /// Looks up a localized string similar to h1.Security notification /// @@ -611,7 +628,7 @@ namespace ASC.Web.Core.PublicResources { /// ///You may change your email or password in your "personal profile page":"$MyStaffLink". /// - ///To send notifications, we use the SMTP settings of ONLYOFFICE mail server. To change them, please follow the instructions "here":"${__HelpLink}/installation/groups-smtp-se [rest of string was truncated]";. + ///To send notifications, we use the SMTP settings of ONLYOFFICE mail server. To change them, please follow the instructions "here":"${__HelpLink}/installation/group [rest of string was truncated]";. /// public static string pattern_enterprise_admin_activation_v10 { get { @@ -736,7 +753,7 @@ namespace ASC.Web.Core.PublicResources { /// ///The easiest way to add your team is to import the necessary users and groups from an LDAP Server (e.g. OpenLDAP Server or Microsoft Active Directory). The LDAP settings are available in your Control Panel. Instructions are available in our "Help Center":""${__HelpLink}/administration/control-panel-ldap.aspx". /// - ///You can also distribute the invitation link using the Invite users [rest of string was truncated]";. + ///You can also distribute the invitation link using the Invite u [rest of string was truncated]";. /// public static string pattern_enterprise_admin_invite_teammates_v10 { get { @@ -788,7 +805,7 @@ namespace ASC.Web.Core.PublicResources { /// ///"Request a call":"http://www.onlyoffice.com/call-back-form.aspx" /// - ///For any purchase questions, contact us at "sales@onlyoffice.com":"mai [rest of string was truncated]";. + ///For any purchase questions, contact us at "sales@onlyoffice.com [rest of string was truncated]";. /// public static string pattern_enterprise_admin_trial_warning_before7_v10 { get { @@ -818,7 +835,7 @@ namespace ASC.Web.Core.PublicResources { /// ///#To work on documents offline on Windows, Linux and Mac, download "ONLYOFFICE Desktop Editors":"https://www.onlyoffice.com/download-desktop.aspx". ///#To edit documents on mobile devices, get Documents app for "iOS":"https://apps.apple.com/us/app/onlyoffice-documents/id944896972" or "Android":"https://play.google.com/store/apps/details?id=com.onlyoffice.documents". - ///#To manage your team performance on the go [rest of string was truncated]";. + ///#To manage your team performance on th [rest of string was truncated]";. /// public static string pattern_enterprise_admin_user_apps_tips_v10 { get { @@ -894,7 +911,7 @@ namespace ASC.Web.Core.PublicResources { ///3. Add and download files available for you in the Documents. ///4. Organize your schedule with the built-in Calendar. ///5. Use Chat to exchange instant messages. - /// + /// ///To access your web-office, follow the link ///$GreenButton. /// @@ -932,7 +949,7 @@ namespace ASC.Web.Core.PublicResources { ///2. Add your email accounts and manage all correspondence in one place with Mail. ///3. Manage your workflow with Projects and your customer relationships using CRM. ///4. Use Community to start your blogs, forums, add events, share bookmarks. - ///5. Organize your work schedu [rest of string was truncated]";. + ///5. Organize your work sc [rest of string was truncated]";. /// public static string pattern_enterprise_user_welcome_v10 { get { @@ -1011,7 +1028,7 @@ namespace ASC.Web.Core.PublicResources { /// ///*Enable automatic backups* in the Control Panel. We also recommend that you use third-party services and make a backup copy of the server from time to time. /// - ///*Adjust portal security settings*: restrict access u [rest of string was truncated]";. + ///*Adjust portal security settings*: restrict [rest of string was truncated]";. /// public static string pattern_enterprise_whitelabel_admin_welcome_v10 { get { @@ -1044,7 +1061,7 @@ namespace ASC.Web.Core.PublicResources { ///# Edit your "profile":"$MyStaffLink". ///# View and comment the content available in the "Community":"${__VirtualRootPath}/Products/Community/" and "Projects":"${__VirtualRootPath}/Products/Projects/". ///# Add and download files available for you in the "Documents":"${__VirtualRootPath}/Products/Files/". - ///# Organize your schedule with the built-in "Calendar":"${__VirtualRootPath}/addon [rest of string was truncated]";. + ///# Organize your schedule with the built-in "Calendar":"${__VirtualRootPath [rest of string was truncated]";. /// public static string pattern_enterprise_whitelabel_guest_welcome_v10 { get { @@ -1078,7 +1095,7 @@ namespace ASC.Web.Core.PublicResources { /// ///# Create and edit "Documents":"${__VirtualRootPath}/Products/Files/", share them with teammates, and collaborate in real time. ///# Add your email accounts and manage all correspondence in one place with "Mail":"${__VirtualRootPath}/addons/mail/". - ///# Manage your workflow with "Projects":"${__VirtualRootPath}/Products/Projects/" and your customer re [rest of string was truncated]";. + ///# Manage your workflow with "Projects":"${__VirtualRootPath}/Products/Projects/" and your custom [rest of string was truncated]";. /// public static string pattern_enterprise_whitelabel_user_welcome_v10 { get { @@ -1199,7 +1216,7 @@ namespace ASC.Web.Core.PublicResources { ///ONLYOFFICE™ Support Team ///"www.onlyoffice.com":"http://onlyoffice.com/" /// - ///^To change the notification type, please manage your "subscription settings": [rest of string was truncated]";. + ///^To change the notification type, please manage your "subscription [rest of string was truncated]";. /// public static string pattern_migration_error { get { @@ -1219,7 +1236,7 @@ namespace ASC.Web.Core.PublicResources { ///ONLYOFFICE™ Support Team ///"www.onlyoffice.com":"http://onlyoffice.com/" /// - ///^To change the notification type, please manage your "subscription settings":"$Recipi [rest of string was truncated]";. + ///^To change the notification type, please manage your "subscription setting [rest of string was truncated]";. /// public static string pattern_migration_server_failure { get { @@ -1237,7 +1254,7 @@ namespace ASC.Web.Core.PublicResources { ///If you have any questions or need assistance please feel free to contact us at "support@onlyoffice.com":"mailto:support@onlyoffice.com" /// ///Best regards, - ///ONLYOFFICE [rest of string was truncated]";. + ///O [rest of string was truncated]";. /// public static string pattern_migration_start { get { @@ -1273,7 +1290,7 @@ namespace ASC.Web.Core.PublicResources { /// ///You may change your email or password in your "personal profile page":"$MyStaffLink". /// - ///To send notifications, we use the SMTP settings of ONLYOFFICE mail server. To change them, please follow the instructions "here":"${__HelpLink}/server/windows/communi [rest of string was truncated]";. + ///To send notifications, we use the SMTP settings of ONLYOFFICE mail server. To change them, please follow the instructions "here":"${__HelpLink}/server/windows/ [rest of string was truncated]";. /// public static string pattern_opensource_admin_activation_v11 { get { @@ -1303,7 +1320,7 @@ namespace ASC.Web.Core.PublicResources { /// ///*Get an SSL certificate*, if you are going to provide not only local but also external portal access for your users. Generate a new signed certificate in the Control Panel or purchase one from the provider you trust. /// - ///*Enable automatic backups* in the Control Panel. We also recommend that you use third-party services and make a backup copy of the server with ONLYOFFICE installed from time to time. Instructions in our "Help [rest of string was truncated]";. + ///*Enable automatic backups* in the Control Panel. We also recommend that you use third-party services and make a backup copy of the server with ONLYOFFICE installed from time to time. Instructions in our " [rest of string was truncated]";. /// public static string pattern_opensource_admin_welcome_v11 { get { @@ -1453,9 +1470,7 @@ namespace ASC.Web.Core.PublicResources { /// ///- Creating and filling out digital forms, e.g. a freelance project proposal; /// - ///- Document comparison and Version History; - /// - ///- Chan [rest of string was truncated]";. + ///- Document comparison and Version Histo [rest of string was truncated]";. /// public static string pattern_personal_after_registration14 { get { @@ -1489,7 +1504,7 @@ namespace ASC.Web.Core.PublicResources { /// ///- To work on documents offline on Windows, Linux and macOS, download "ONLYOFFICE Desktop Editors":"https://www.onlyoffice.com/download-desktop.aspx". /// - ///- To edit documents on mobile devices, get ONLYOFFICE Documents app for [rest of string was truncated]";. + ///- To edit documents on mobile devices, get ONLYOFFICE Documents app f [rest of string was truncated]";. /// public static string pattern_personal_after_registration28 { get { @@ -1544,6 +1559,21 @@ namespace ASC.Web.Core.PublicResources { } } + /// + /// Looks up a localized string similar to Want to change the password on your ONLYOFFICE Personal account? Click the button below to confirm. + /// + ///$GreenButton + /// + ///The link is valid for 7 days. + /// + ///Don’t want to change your password? Just ignore this message.. + /// + public static string pattern_personal_change_password_v115 { + get { + return ResourceManager.GetString("pattern_personal_change_password_v115", resourceCulture); + } + } + /// /// Looks up a localized string similar to Hello, /// @@ -1563,11 +1593,11 @@ namespace ASC.Web.Core.PublicResources { /// /// Looks up a localized string similar to You have requested a termination of your account at personal.onlyoffice.com. Follow the link to complete the request (the link is active for a 7-day period): /// - ///Confirm account termination + ///$GreenButton /// ///*Note*: After the deletion, your account and all data associated with it will be erased permanently in accordance with our "Privacy statement":"https://help.onlyoffice.com/products/files/doceditor.aspx?fileid=5048502&doc=SXhWMEVzSEYxNlVVaXJJeUVtS0kyYk14YWdXTEFUQmRWL250NllHNUFGbz0_IjUwNDg1MDIi0". /// - ///"Read more about account [rest of string was truncated]";. + ///"Read more about account termination":" [rest of string was truncated]";. /// public static string pattern_personal_profile_delete { get { @@ -1908,7 +1938,7 @@ namespace ASC.Web.Core.PublicResources { ///ONLYOFFICE™ Support Team ///"www.onlyoffice.com":"http://onlyoffice.com/" /// - ///^To change the notification type, please manage your "subscription settings":"$RecipientSubsc [rest of string was truncated]";. + ///^To change the notification type, please manage your "subscription settings":"$Re [rest of string was truncated]";. /// public static string pattern_restore_started { get { @@ -1946,7 +1976,7 @@ namespace ASC.Web.Core.PublicResources { ///Browse "Help Center":"${__HelpLink}" when you are not sure how to perform your task. Contact "our support team":"https://helpdesk.onlyoffice.com" if you face tech problems. /// ///*#2 Don’t forget about 3rd party extensions* - ///ONLYOFFICE functionality can be enhanced with 3rd party extensions. For example, you can make VoIP calls with Twilio or e-sign your documents with DocuSign. "Find out m [rest of string was truncated]";. + ///ONLYOFFICE functionality can be enhanced with 3rd party extensions. For example, you can make VoIP calls with Twilio or e-sign your documents with DocuSign. "Fi [rest of string was truncated]";. /// public static string pattern_saas_admin_comfort_tips_v115 { get { @@ -1962,7 +1992,7 @@ namespace ASC.Web.Core.PublicResources { ///# *Documents*. Store and manage docs, sheets, and slides. Edit them and collaborate with your team. Create and co-edit professional-looking forms online, let other users fill them in, save forms as PDF files. ///# *Projects*. Plan activities, create and assign tasks, set deadlines. ///# *CRM*. Maintain customers database, track sales, create invoices. - ///# *Calendar*. Arrange meetings with shareable calendars and set r [rest of string was truncated]";. + ///# *Calendar*. Arrange meetings with shareable calendars and se [rest of string was truncated]";. /// public static string pattern_saas_admin_modules_v115 { get { @@ -1979,7 +2009,7 @@ namespace ASC.Web.Core.PublicResources { ///# *Customize your online office* style to match your branding. ///# *Edit unlimited number of docs*, sheets, and slides simultaneously. ///# *Ensure security*: enable 2FA, configure automatic backups, track user actions. - ///# *Integrate with your infrastructure*: us [rest of string was truncated]";. + ///# *Integrate with your infrastructur [rest of string was truncated]";. /// public static string pattern_saas_admin_payment_warning_every_2months_v115 { get { @@ -1994,7 +2024,7 @@ namespace ASC.Web.Core.PublicResources { /// ///$GreenButton /// - ///If you think thi [rest of string was truncated]";. + ///If you thi [rest of string was truncated]";. /// public static string pattern_saas_admin_trial_warning_after_half_year_v115 { get { @@ -2049,7 +2079,7 @@ namespace ASC.Web.Core.PublicResources { /// ///To extend your trial, contact our "sales team":"mailto:sales@onlyoffice.com". /// - ///You can switch to free Startup plan on "Payments page":"$PricingPage". Free plan has up to 10 users and 2Gb of storage per portal. Some features will become unavailable, including LDAP, SSO, branding, automatic backups. "Compare plan [rest of string was truncated]";. + ///You can switch to free Startup plan on "Payments page":"$PricingPage". Free plan has up to 10 users and 2Gb of storage per portal. Some features will become unavailable, including LDAP, SSO, branding, automatic backups. "Compare pla [rest of string was truncated]";. /// public static string pattern_saas_admin_trial_warning_v115 { get { @@ -2063,7 +2093,7 @@ namespace ASC.Web.Core.PublicResources { ///Get free ONLYOFFICE apps to work on documents and projects from any of your devices. /// ///· To work on documents offline on Windows, Linux and Mac, download "ONLYOFFICE Desktop Editors":"https://www.onlyoffice.com/download-desktop.aspx". You can connect the app to your cloud for online collaboration. - ///· To edit documents on mobile devices, get ONLYOFFICE Documents app for "iOS":"https://apps.apple.com/us/app/onlyoffice-documents/id944896972" or "Android":"https://play.google.com/store/apps/det [rest of string was truncated]";. + ///· To edit documents on mobile devices, get ONLYOFFICE Documents app for "iOS":"https://apps.apple.com/us/app/onlyoffice-documents/id944896972" or "Android":"https://play.google.com/store/apps [rest of string was truncated]";. /// public static string pattern_saas_admin_user_apps_tips_v115 { get { @@ -2278,10 +2308,10 @@ namespace ASC.Web.Core.PublicResources { ///# *Edit unlimited number of docs*, sheets, slides, and forms simultaneously. ///# *Customize your online office* style to match your branding. ///# *Ensure security:* enable 2FA, configure automatic backups, track user actions. - ///# *Integrate with your infrastructure:* use LDAP, SSO, and your domain name for portal address. - ///# *Connect apps for productive work:* Twilio, DocuSign, etc. - /// - ///If you need instructions on configuring/using ONLYOFFICE, [rest of string was truncated]";. + ///# *Integrate with your infrastructure:* use LDAP, SSO, and your domain name for portal address. + ///# *Connect apps for productive work:* Twilio, DocuSign, etc. + /// + ///If you need instructions on configuring/using ONLYO [rest of string was truncated]";. /// public static string pattern_saas_admin_welcome_v115 { get { @@ -2316,7 +2346,7 @@ namespace ASC.Web.Core.PublicResources { ///1. Edit your "profile":"$MyStaffLink". ///2. View and comment the content available in the "Community":"${__VirtualRootPath}/Products/Community/" and "Projects":"${__VirtualRootPath}/Products/Projects/". ///3. Add and download files available for you in the "Documents":"${__VirtualRootPath}/Products/Files/". - ///4. Organize your schedule with the built-in "Calendar":"${__VirtualRootPath}/a [rest of string was truncated]";. + ///4. Organize your schedule with the built-in "Calendar":"${__VirtualRootPa [rest of string was truncated]";. /// public static string pattern_saas_guest_welcome_v115 { get { @@ -2350,7 +2380,7 @@ namespace ASC.Web.Core.PublicResources { /// ///1. Create and edit "Documents":"${__VirtualRootPath}/Products/Files/", share them with teammates, collaborate in real time, and work with forms. ///2. Add your email accounts and manage all correspondence in one place with "Mail":"${__VirtualRootPath}/addons/mail/". - ///3. Manage your workflow with "Projects":"${__VirtualRootPath}/Products/Projects/" [rest of string was truncated]";. + ///3. Manage your workflow with "Projects":"${__VirtualRootPath}/Products/Projec [rest of string was truncated]";. /// public static string pattern_saas_user_welcome_v115 { get { @@ -2401,7 +2431,7 @@ namespace ASC.Web.Core.PublicResources { ///#end /// /// - ///^If you do not want to receive the notifications about the new [rest of string was truncated]";. + ///^If you do not want to receive the notificatio [rest of string was truncated]";. /// public static string pattern_send_whats_new { get { diff --git a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx index a83364219c..b0192c7760 100644 --- a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx +++ b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx @@ -1,5 +1,64 @@  + @@ -53,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Blog was created at @@ -2027,4 +2086,27 @@ Don’t want to change your password? Just ignore this message. Confirm Room Invite + + h1.Mobile phone change request + +You have requested to change your mobile phone used to enter the ${LetterLogoText} portal. + +Please follow the link below to change your mobile phone: + +$GreenButton + +If you do not want to change your mobile phone or received this email by mistake, please ignore it or contact your portal administrator to find out the details. + + + Want to change the password on your ONLYOFFICE Personal account? Click the button below to confirm. + +$GreenButton + +The link is valid for 7 days. + +Don’t want to change your password? Just ignore this message. + + + Log in to your ONLYOFFICE Personal account + \ No newline at end of file diff --git a/web/ASC.Web.Core/PublicResources/webstudio_patterns.xml b/web/ASC.Web.Core/PublicResources/webstudio_patterns.xml index f804552159..d02d7f7701 100644 --- a/web/ASC.Web.Core/PublicResources/webstudio_patterns.xml +++ b/web/ASC.Web.Core/PublicResources/webstudio_patterns.xml @@ -226,8 +226,8 @@ $activity.Key - - + + @@ -678,8 +678,8 @@ $activity.Key - - + + @@ -708,8 +708,8 @@ $activity.Key - - + +