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
..
active-connections.aspx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
add-guests.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
add-resource.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
authorization-keys-saas.aspx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
available-languages.aspx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
backup-saas.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
Calendar.aspx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
change-to-guest.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
Community.aspx	Fix insert-objects.ascx for desktop-video-support.aspx	2022-04-04 11:41:57 +03:00
Configuration.aspx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
configuring-modules.aspx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
Connect-Box.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
Connect-Dropbox.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
Connect-Google-Drive.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
Connect-Kdrive.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
Connect-Nextcloud.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
Connect-Onedrive.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
Connect-Owncloud.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
control-panel-audit-trail.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-backup.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-branding.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-changelog.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-encryption.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-full-text-search.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-https.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-install-mail.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-ldap.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-login-history.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-multitenancy.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-nextcloud-migration.aspx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
control-panel-sso-adfs.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-sso-description.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-sso-onelogin.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-sso-shibboleth.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-storage.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel-update.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
control-panel.aspx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
crm-adding-fields.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
crm-contact-form.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
crm-contact-types.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
crm-default-currency.aspx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
crm-export.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
crm-history-event.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
crm-invoice-items.aspx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
crm-mass-mailing.aspx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
crm-opportunity-stages.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
crm-tags.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
crm-tasks-categories.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
crm-temperature-levels.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
CRM.aspx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
customizing-modules.aspx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
Documents.aspx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
external-services.aspx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
gettingstarted-security-workspace.aspx	Remove duplicated control for ldap article, remove redirected sso page	2022-03-30 12:50:44 +03:00
google-user-data.aspx	Administration section	2020-10-06 13:05:16 +03:00
import-contacts-from-csv.aspx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
import-contacts-from-mail-client.aspx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
import-contacts-from-web.aspx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
ldap-settings-saas.aspx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
mail-alias-groups.aspx	Administration section	2020-10-06 13:05:16 +03:00
mail-project.aspx	Administration section	2020-10-06 13:05:16 +03:00
mail-server.aspx	Administration section	2020-10-06 13:05:16 +03:00
mail-tables.aspx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
Mail.aspx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
managing-users.aspx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
organize-company-documentation.aspx	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
People.aspx	Try to fix administration/control-panel-ldap.aspx	2022-03-29 17:25:47 +03:00
portal-language.aspx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
portal-management.aspx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
Projects.aspx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
reinforcing-security.aspx	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
sso-settings-saas.aspx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
talk-attachment-size.aspx	Try to fix workspace-saas-change-payment-plan.aspx	2022-03-31 13:12:04 +03:00
Talk.aspx	Фикс прекомпиляции хелпцентра	2021-11-24 19:02:19 +03:00
two-factor-authentication.aspx	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
workspace.aspx	Administration section	2020-10-06 13:05:16 +03:00