Merge branch 'feature/docspace' into feature/test-fixes-december-23

Web/Controls/Help/Guides/General/DocSpaceLDAP/DocSpaceLDAP.ascx

@@ -88,7 +88,7 @@
              <p>You can also add the following attributes: </p>
                     <ul>                        
                         <li><b>User quota</b> - to set a storage quota for this user, enter an integer value for this attribute in the LDAP directory. It will display the quota value in bytes. This attribute will be applied only during the first setup and can be changed manually in the Accounts section.</li>
-                        <li><b>User Type</b> - all users will be added to DocSpace with the selected type (power user, room admin, DocSpace admin).</li>
+                        <li><b>User Type</b> - all users will be added to DocSpace with the selected type (user, power user, room admin, DocSpace admin). The <b>User</b> type is selected by default. Users can only access the rooms they are invited to by admins, and can't create own rooms, folders or files. Select another type to provide more permissions. Otherwise, you can change the type manually in the Accounts section.</li>
                     </ul>
                 </li>
         <li>Click the <b>Group membership</b> switcher if you want to add groups from LDAP server to your DocSpace and fill out the necessary fields:

Web/Controls/Help/Guides/General/DocSpaceMigrationGoogle/DocSpaceMigrationGoogle.ascx

@@ -75,7 +75,7 @@
                     <li>Log in to your <b>ONLYOFFICE DocSpace</b>.</li>
                     <li>Use the <img alt="Options icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/GettingStarted/dsoptionsicon.png")%>" /> menu in the lower left corner and select the <b>Settings</b> option.</li>
                     <li>Choose the <b>Data import</b> section.</li>
-                    <li>Click the <b>Import</b> link next to the <b>Google Workspace</b> service or the the <b>Google Workspace</b> item itself.
+                    <li>Click the <b>Import</b> link next to the <b>Google Workspace</b> service or the <b>Google Workspace</b> item itself.
                         <div class="screenBlock"> 
 				            <img alt="Migrating Google Workspace data to ONLYOFFICE DocSpace" target="image-4_eventcom_guides" class="screenphoto screen_guides" src="<%=VirtualPathUtility.ToAbsolute("~/images/help/Guides/big/guide218/step1-1.png")%>" />     
 				            <img alt="Migrating Google Workspace data to ONLYOFFICE DocSpace" id="image-4_eventcom_guides" class="bigphoto_screen" src="<%=VirtualPathUtility.ToAbsolute("~/images/help/Guides/big/guide218/step1-1.png")%>" />

Web/Controls/Help/Guides/General/DocSpaceMigrationNextcloud/DocSpaceMigrationNextcloud.ascx

@@ -101,7 +101,7 @@
                     <li>Log in to your <b>ONLYOFFICE DocSpace</b>.</li>
                     <li>Use the <img alt="Options icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/GettingStarted/dsoptionsicon.png")%>" /> menu in the lower left corner and select the <b>Settings</b> option.</li>
                     <li>Choose the <b>Data import</b> section.</li>
-                    <li>Click the <b>Import</b> link next to the <b>Nextcloud</b> service or the the <b>Nextcloud</b> item itself.
+                    <li>Click the <b>Import</b> link next to the <b>Nextcloud</b> service or the <b>Nextcloud</b> item itself.
                         <div class="screenBlock"> 
 				            <img alt="Migrating Nextcloud data to ONLYOFFICE DocSpace" target="image-4_eventcom_guides" class="screenphoto screen_guides" src="<%=VirtualPathUtility.ToAbsolute("~/images/help/Guides/big/guide218/step1-1.png")%>" />     
 				            <img alt="Migrating Nextcloud data to ONLYOFFICE DocSpace" id="image-4_eventcom_guides" class="bigphoto_screen" src="<%=VirtualPathUtility.ToAbsolute("~/images/help/Guides/big/guide218/step1-1.png")%>" />

Web/Controls/Help/Guides/General/DocSpaceMigrationWorkspace/DocSpaceMigrationWorkspace.ascx

@@ -37,7 +37,7 @@
                     <li>Log in to your <b>ONLYOFFICE DocSpace</b>.</li>
                     <li>Use the <img alt="Options icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/GettingStarted/dsoptionsicon.png")%>" /> menu in the lower left corner and select the <b>Settings</b> option.</li>
                     <li>Choose the <b>Data import</b> section.</li>
-                    <li>Click the <b>Import</b> link next to the <b>ONLYOFFICE Workspace</b> service or the the <b>ONLYOFFICE Workspace</b> item itself.
+                    <li>Click the <b>Import</b> link next to the <b>ONLYOFFICE Workspace</b> service or the <b>ONLYOFFICE Workspace</b> item itself.
                         <div class="screenBlock"> 
 				            <img alt="Migrating ONLYOFFICE Workspace data to ONLYOFFICE DocSpace" target="image-4_eventcom_guides" class="screenphoto screen_guides" src="<%=VirtualPathUtility.ToAbsolute("~/images/help/Guides/big/guide218/step1-1.png")%>" />     
 				            <img alt="Migrating ONLYOFFICE Workspace data to ONLYOFFICE DocSpace" id="image-4_eventcom_guides" class="bigphoto_screen" src="<%=VirtualPathUtility.ToAbsolute("~/images/help/Guides/big/guide218/step1-1.png")%>" />

Web/Controls/Help/Installation/DocSpaceChangelogDescr.ascx

@@ -16,6 +16,7 @@
             <li>Backup now has smoother progress and uses less memory.</li>  
             <li>Written a new component for tabs. Added the ability to automatically scroll when clicking on a tab that is not fully visible. Added blur to the container edges.</li> 
             <li>Changed email messages, added new ones, reworked texts and links.</li> 
+            <li>Localized logos and product names for China.</li>
         </ul>
         <p class="changelog-subheader">Settings</p>       
         <ul>
@@ -37,15 +38,14 @@
             <li>Added a new room type: Form filling. In these rooms, users can create forms on the base of PDF templates and invite other users to fill out these forms. Once the forms are completed, the data from them is automatically analyzed and compiled into a spreadsheet.</li>  
             <li>Changed room icons in the room creation panel. Added effects when hovering a cursor over a button, the button border now matches the portal theme.</li> 
             <li>Added the ability to open a media file / image via an external link.</li> 
-            <li>Added a context menu for creating new items instead of the standard browser menu.</li>     
-            <li>Added a country and city to IP in the Location column in the profile for the SaaS version.</li>  
+            <li>Added a context menu for creating new items instead of the standard browser menu.</li>  
             <li>Added the ability to copy a link to a folder for external users in Public rooms.</li>   
             <li>Fixed a bug with the incorrect table in Rooms.</li>      
             <li>Added the ability to open a document in the same tab.</li>   
             <li>Renamed the My Documents section to Documents, updated its icon.</li>  
             <li>In a mobile browser, the ONLYOFFICE logo will not be displayed when opening the editor if the license allows (Docs v8.1 and later required).</li>  
             <li>Added support for new entries in the file and room history (for files: converting files; for files and folders: renaming, moving, copying files and folders; for rooms: renaming rooms, changing a logo, adding/removing tags, adding/renaming/removing links, changing roles/removing users, changing roles/adding/removing groups).</li> 
-            <li>Added the ability to embed documents from Public rooms and Public rooms.</li>
+            <li>Added the ability to embed Public rooms and documents from them.</li>
             <li>Implemented duplication for rooms and folders. Changed the duplication method for files. When duplicating rooms, the icon and tags are copied, users are deleted. Duplicated items have an index at the end of the name.</li>
             <li>Added a limit on the number of pinned rooms - 10.</li>
             <li>Added a hotkey for renaming files/folders - F2.</li>
@@ -53,7 +53,8 @@
         <p class="changelog-subheader">Accounts</p>       
         <ul>
             <li>Added support for 'ArrowUp' and 'ArrowDown' hotkeys for the list. 'Enter', 'Backspace' for groups.</li>    
-            <li>Changed the work of the filter by user status.</li>        
+            <li>Changed the work of the filter by user status.</li>
+            <li>Added a country and city to IP in the Location column in the profile for the SaaS version.</li>        
         </ul>
     </div>
 </div>