|
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 |
|
|
d2eede8b7f
|
Add Migrating Nextcloud data article
|
2022-04-19 17:01:32 +03:00 |
|
|
4b016334ac
|
Fix administration/configuration.aspx
|
2022-04-05 12:57:43 +03:00 |
|
|
4da7d887ff
|
Fix insert-objects.ascx for desktop-video-support.aspx
|
2022-04-04 11:41:57 +03:00 |
|
|
541bc4c7f6
|
Try to fix workspace-saas-change-payment-plan.aspx
|
2022-03-31 13:12:04 +03:00 |
|
|
6583397eb4
|
Try to fix groups-authorization-keys.aspx
|
2022-03-30 23:53:26 +03:00 |
|
|
2d6d061d30
|
Remove duplicated control for ldap article, remove redirected sso page
|
2022-03-30 12:50:44 +03:00 |
|
|
60f121b540
|
Try to fix administration/control-panel-ldap.aspx
|
2022-03-29 17:25:47 +03:00 |
|
|
de81884ff8
|
Fix windows-version.ascx tag
|
2022-03-28 23:16:19 +03:00 |
|
|
abd9e76396
|
Fixes for groups-gettingstarted-projects.aspx - Part 2
|
2022-03-25 14:13:39 +03:00 |
|
|
11539f099b
|
Fixes for groups-gettingstarted-projects.aspx Part 1
|
2022-03-24 09:59:42 +03:00 |
|
|
a102fff4fc
|
Merge remote-tracking branch 'remotes/origin/feature/security' into feature/test-merge-for-release
# Conflicts:
# Web/Controls/Help/Tags/custom-domain-name/custom-domain-name.ascx
# Web/Controls/Help/Tags/invite-people/invite-people.ascx
# Web/Controls/Help/Tags/password-strength/password-strength.ascx
# Web/Controls/Help/Tags/restore-backup/restore-backup.ascx
# Web/Controls/Help/Tags/security/security.ascx
# Web/Controls/Help/Tags/trusted-domains/trusted-domains.ascx
|
2022-03-18 13:30:18 +03:00 |
|
|
daeb2f6bdc
|
Finish editing local-server.ascx
|
2022-03-15 14:25:37 +03:00 |
|
|
2f1ac5ec73
|
Add Project module changes, Active connections article. Update screenshots and tags
|
2022-03-09 18:24:41 +03:00 |
|
|
93e0c4d32a
|
Add Workspace Enterprise Edition Security Guide
|
2022-02-18 15:49:26 +03:00 |
|
SvetlanaLisina
|
5526849ebf
|
Фикс прекомпиляции хелпцентра
# Conflicts:
# Web/Controls/Help/GettingStarted/Integration/Jira/GettingStartedJira.ascx
# Web/Controls/Help/GettingStarted/Integration/Mattermost/GettingStartedMattermost.ascx
# Web/Integration/gettingstarted-mattermost.aspx
# Web/Integration/gettingstarted-redmine.aspx
|
2021-11-24 19:02:19 +03:00 |
|
|
a28b00107c
|
Merge branch 'feature/yandex' into release/1.2.0
|
2021-11-24 18:49:02 +03:00 |
|
|
6a39a6d3d7
|
Fix title in English, remove 'outofdate' from index pages
|
2021-10-20 17:13:16 +03:00 |
|
|
c6690db248
|
Add videos to pages and update several images
|
2021-10-20 17:02:10 +03:00 |
|
|
5e05cdb8d9
|
Remove "outofdate" for new administration articles
|
2021-10-07 11:30:11 +03:00 |
|
|
3b6226bdba
|
Added new videos, updated video images, headers, tags
|
2021-05-21 18:40:03 +03:00 |
|
|
1028a10d9d
|
Restored administration/control-panel-sso-description.aspx
Removed duplicated page added in old structure server/windows/community/Sso-settings.aspx
|
2021-04-09 15:28:18 +03:00 |
|
|
4a664bcad4
|
Fixed: LDAP and SSO for SaaS - tags, controls, screenshots.
Deleted control-panel-sso-description.aspx
|
2021-04-09 14:45:31 +03:00 |
|
|
27bfbcc119
|
Structure fixes, updated Getting Started screens
|
2021-04-09 12:00:39 +03:00 |
|
|
faca3f5fd9
|
Fixed LDAP and SSO (links and controls) + edited UsingSearch.ascx for SaaS.
|
2021-04-07 18:49:03 +03:00 |
|
|
635a0f515b
|
Added links in tags and index page + removed "out of date" from the German version.
|
2021-03-15 12:25:21 +03:00 |
|
|
9a1a203d30
|
Added the article in English and its controls.
|
2021-03-11 14:05:38 +03:00 |
|
|
8d9030ec97
|
Edited authorization-keys-saas.aspx (added modules_list class so that .serverversion_display text blocks are not visible)
|
2021-02-05 14:22:05 +03:00 |
|
|
bd2e41a68a
|
Fixed Download button for Control Panel guides
|
2020-12-18 15:17:32 +03:00 |
|
|
a35327f83f
|
Added the 'Audit Trail' and 'Login History' guides to the Control Panel section
|
2020-12-18 14:56:30 +03:00 |
|
|
825473e41d
|
Added missing guide to the Administration section
|
2020-12-09 13:38:59 +03:00 |
|
|
dcf224f4e7
|
Removed duplicate Control Panel guides
|
2020-11-09 17:33:06 +03:00 |
|
|
4afdf74578
|
Merge branch 'feature/control-panel-guides'
# Conflicts:
# Web/Controls/Help/ArticlesCompleteList/ControlPanel/90023_ce_install_mail_server/90023_ce_install_mail_server.ru.ascx
# Web/Controls/Help/ArticlesCompleteList/ControlPanel/90026_update_community/90026_update_community.ru.ascx
# Web/Controls/Help/Installation/WorkspaceCommunity.ascx
# Web/administration/control-panel-community-backup.aspx
# Web/administration/control-panel-community-branding.aspx
# Web/administration/control-panel-community-encryption.aspx
# Web/administration/control-panel-community-full-text-search.aspx
# Web/administration/control-panel-community-https.aspx
# Web/administration/control-panel-community-ldap.aspx
# Web/administration/control-panel-community-multitenancy.aspx
# Web/administration/control-panel-community-sso-adfs.aspx
# Web/administration/control-panel-community-sso-description.aspx
# Web/administration/control-panel-community-sso-onelogin.aspx
# Web/administration/control-panel-community-sso-shibboleth.aspx
# Web/administration/control-panel-community-storage.aspx
# Web/css/common.less
|
2020-11-05 15:46:55 +03:00 |
|
|
0a87ba77a8
|
Moved Control Panel guides to Administration guides
|
2020-11-03 18:00:31 +03:00 |
|
|
8dd2162d58
|
Moved Managing subscriptions from Administration to User Guides; changed links for Connecting third-party storages in the Administration section
|
2020-10-14 17:16:47 +03:00 |
|
|
f9b66ddaf0
|
Administration section
|
2020-10-06 13:05:16 +03:00 |
|