svetlana maleeva 1dc034de40 Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release ... # Conflicts: # Web/Controls/Help/Administration/Administration.ascx # Web/Controls/Help/Administration/ControlPanel.ascx # Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.ascx # Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.de.ascx # Web/Controls/Help/ArticlesCompleteList/Guides/151_share_text/151_share_text.ascx # Web/Controls/Help/ArticlesCompleteList/ONLYOFFICEEditors/2021_using-chat.ascx # Web/Controls/Help/ArticlesCompleteList/TipsTricks/130_folder_permissions/130_folder_permissions.ascx # Web/Controls/Help/Desktop/Documents/Common/PrivateRoom/PrivateRoom.de.ascx # Web/Controls/Help/GettingStarted/Projects/GettingStartedProjects.de.ascx # Web/Controls/Help/Guides/Documents/ShareDocuments/ShareDocuments.ascx # Web/Controls/Help/ONLYOFFICEEditors/EditorsUserGuides/EditorsUserGuides.ascx # Web/Controls/Help/Tags/generate-report/generate-report.ascx # Web/Controls/Help/Tags/generate-report/generate-report.de.ascx # Web/Controls/Help/Tags/manage-access-rights/manage-access-rights.ascx # Web/Controls/Help/Tags/onlyoffice-people/onlyoffice-people.ascx # Web/Controls/Help/Tags/onlyoffice-people/onlyoffice-people.de.ascx # Web/Controls/Help/Tags/onlyoffice-projects/onlyoffice-projects.ascx # Web/Controls/Help/Tags/onlyoffice-projects/onlyoffice-projects.de.ascx # Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.ascx # Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.de.ascx # Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.es.ascx # Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.fr.ascx # Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.it.ascx # Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.ru.ascx # Web/Controls/Help/Tags/report-templates/report-templates.ascx # Web/Controls/Help/Tags/report-templates/report-templates.de.ascx # Web/Controls/Help/Tags/security/security.ascx # Web/Controls/Help/Tags/security/security.de.ascx # Web/Controls/Help/Tags/track-birthdays/track-birthdays.ascx # Web/Controls/Help/Tags/track-birthdays/track-birthdays.de.ascx # Web/Controls/Help/Tags/track-birthdays/track-birthdays.es.ascx # Web/Controls/Help/Tags/track-birthdays/track-birthdays.fr.ascx # Web/Controls/Help/Tags/track-birthdays/track-birthdays.it.ascx # Web/Controls/Help/Tags/track-birthdays/track-birthdays.ru.ascx # Web/Controls/Help/UserGuides/DocsGuides.ascx # Web/Controls/Help/UserGuides/DocsGuides.de.ascx # Web/Controls/Help/UserGuides/DocsGuides.fr.ascx # Web/Controls/Help/UserGuides/DocsUserGuides.ascx # Web/Controls/Help/UserGuides/DocsUserGuides.de.ascx # Web/Controls/Help/UserGuides/DocsUserGuides.fr.ascx # Web/Controls/Help/UserGuides/DocsUserGuides.ru.ascx # Web/Controls/Help/UserGuides/Groups.ascx # Web/Controls/Help/UserGuides/Groups.de.ascx # Web/Controls/Help/UserGuides/GroupsDocuments.ascx # Web/Controls/Help/UserGuides/GroupsMail.de.ascx # Web/Controls/Help/UserGuides/GroupsProjects.ascx # Web/Controls/Help/UserGuides/GroupsProjects.de.ascx # Web/Controls/Help/UserGuides/UserGuides.ascx # Web/ONLYOFFICE-Editors/Editors-User-Guides/DocumentEditor/Add-watermark.aspx # Web/ONLYOFFICE-Editors/Editors-User-Guides/SpreadsheetEditor/Merge-and-unmerge-cells.aspx # Web/ONLYOFFICE-Editors/Editors-User-Guides/SpreadsheetEditor/Merge-cells.aspx		2022-04-20 16:11:30 +03:00
..
DocsDE.ascx	Merge branch 'feature/test-3-branches-further-changes' into feature/test-merge-for-release	2022-03-17 13:10:38 +03:00
DocsDE.de.ascx	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
DocsDE.fr.ascx	Rename controls	2022-02-15 17:04:43 +03:00
DocsDE.ru.ascx	Rename controls	2022-02-15 17:04:43 +03:00
DocsGuides.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
DocsGuides.de.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
DocsGuides.fr.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
DocsGuides.ru.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
DocsPE.ascx	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
DocsPE.de.ascx	Fixes in translations and menus	2022-01-17 13:03:09 +03:00
DocsPE.fr.ascx	Fixes in translations and menus	2022-01-17 13:03:09 +03:00
DocsPE.ru.ascx	Fixes in translations and menus	2022-01-17 13:03:09 +03:00
DocsSE.ascx	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
DocsSE.de.ascx	German translation for new info in the build (no forms yet).	2021-12-23 19:29:32 +03:00
DocsSE.fr.ascx	Fixes in translations and menus	2022-01-17 13:03:09 +03:00
DocsSE.it.ascx	Фикс прекомпиляции хелпцентра	2021-11-24 19:02:19 +03:00
DocsSE.ru.ascx	Fixes in translations and menus	2022-01-17 13:03:09 +03:00
DocsUserGuides.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
DocsUserGuides.de.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
DocsUserGuides.fr.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
DocsUserGuides.ru.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
Groups.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
Groups.de.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
Groups.fr.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
Groups.ru.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
GroupsCalendar.ascx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
GroupsCalendar.de.ascx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
GroupsCalendar.fr.ascx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
GroupsCalendar.ru.ascx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
GroupsCommunity.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
GroupsCommunity.de.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
GroupsCommunity.fr.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
GroupsCommunity.ru.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
GroupsCRM.ascx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
GroupsCRM.de.ascx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
GroupsCRM.fr.ascx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
GroupsCRM.ru.ascx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
GroupsDocuments.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
GroupsDocuments.de.ascx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
GroupsDocuments.fr.ascx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
GroupsDocuments.ru.ascx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
GroupsFeed.ascx	Fixes, translations, screenshots for German version. OO Groups Documents module page is reworked in English.	2022-04-15 18:19:11 +03:00
GroupsMail.ascx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
GroupsMail.de.ascx	German for a part of new fixes + intermediate (!) for GettingStartedDocuments.de.ascx	2022-04-11 14:34:36 +03:00
GroupsMail.fr.ascx	Fix for mail.aspx in languages	2022-04-07 14:02:14 +03:00
GroupsMail.ru.ascx	Fix for mail.aspx in languages	2022-04-07 14:02:14 +03:00
GroupsPeople.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
GroupsPeople.de.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
GroupsPeople.fr.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
GroupsPeople.ru.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
GroupsProjects.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
GroupsProjects.de.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
GroupsProjects.fr.ascx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
GroupsProjects.ru.ascx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
MobileAndroid.ascx	Revert 15b380b10d and fixes for /userguides/mobile-android.aspx.	2022-03-03 00:46:50 +03:00
MobileiOS.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileiOS.de.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileiOS.fr.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileiOS.ru.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileProjects.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileProjects.de.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileProjects.fr.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileProjects.ru.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileProjectsAndroid.ascx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
MobileProjectsAndroid.de.ascx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
MobileProjectsAndroid.fr.ascx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
MobileUserGuides.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileUserGuides.de.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileUserGuides.fr.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileUserGuides.ru.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileWeb.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileWeb.de.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileWeb.fr.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
MobileWeb.ru.ascx	Try to fix groups-guides-documents-collaborative-editing.aspx	2022-04-04 16:59:50 +03:00
UserGuides.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
UserGuides.de.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
UserGuides.fr.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
UserGuides.ru.ascx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
Workspace.ascx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
Workspace.de.ascx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
Workspace.fr.ascx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
Workspace.ru.ascx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
WorkspaceGeneralQuestions.ascx	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
WorkspaceGeneralQuestions.de.ascx	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
WorkspaceGeneralQuestions.fr.ascx	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
WorkspaceGeneralQuestions.ru.ascx	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
WorkspaceMail.ascx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
WorkspaceMail.fr.ascx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
WorkspaceMail.ru.ascx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
WorkspacePersonal.ascx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
WorkspaceTalk.ascx	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
WorkspaceTalk.fr.ascx	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
WorkspaceTalk.ru.ascx	Remove HideContents.ascx because of using Resource.resx instead.	2022-03-02 17:42:41 +03:00