Commit Graph

133 Commits

Author SHA1 Message Date
87494b430d Merge branch 'feature/mob_projects_android' into release/1.0.0 2021-10-07 19:02:25 +03:00
c842c2e793 Added new article: Deploying ONLYOFFICE Workspace in Vultr 2021-09-15 20:07:48 +03:00
5fdc0cc281 New article Deploying Docs in Vultr 2021-09-14 17:24:19 +03:00
05b50f5795 Merge remote-tracking branch 'remotes/origin/master' into feature/mob_projects_android
# Conflicts:
#	Web/Controls/Help/ABCIndex/CompleteArticleList.ascx
2021-08-31 12:26:53 +03:00
c70cfb20c9 Added the new page to lists 2021-08-12 12:22:31 +03:00
b6dfb6e86d Added new masters, index page, side menu, add new pages to lists 2021-07-20 13:16:36 +03:00
cff31ef184 Added new article to lists 2021-06-11 12:09:47 +03:00
aa76eb68d3 Revert "Hidden outdated article - 'Migration to server solution' (this commit can be reverted after updating the text)"
This reverts commit ad07565246.
2021-05-27 15:32:58 +03:00
a06e9bbb67 Merge remote-tracking branch 'remotes/origin/feature/build6.3'
# Conflicts:
#	Web/Controls/Help/Server/Document/DSChangelog.ascx
#	Web/Controls/Help/Server/Document/DSChangelog.ru.ascx
#	Web/Controls/Help/Server/Windows/Community/AuthorizationKeys/AuthorizationKeys.ascx
#	Web/Controls/Help/Server/Windows/Community/AuthorizationKeys/AuthorizationKeys.de.ascx
#	Web/Controls/Help/VariousControls/Versions/DocumentServer/DocumentServerDocker_Current.ascx
#	Web/Controls/Help/VariousControls/Versions/DocumentServer/DocumentServerWindows_Current.ascx
#	Web/Controls/Help/VariousControls/Versions/DocumentServer/DocumentServer_Current.ascx
2021-05-19 13:00:59 +03:00
6e6798bad1 Hidden Forms (revert later) 2021-04-30 14:13:37 +03:00
ad07565246 Hidden outdated article - 'Migration to server solution' (this commit can be reverted after updating the text) 2021-04-27 19:03:38 +03:00
e06c75ff3c Updated sitemap, fixed heading in AddWatermark.ascx 2021-04-20 12:14:40 +03:00
7b659856e6 Merge branch 'feature/add-links' into feature/build6.3
# Conflicts:
#	Web/Controls/Help/ABCIndex/CompleteArticleList.ascx
#	Web/Controls/Help/Desktop/Documents/Common/ProtectDocumentWithPassword/ProtectDocumentWithPassword.ascx
#	Web/Controls/Help/Desktop/Documents/Common/ProtectDocumentWithPassword/ProtectDocumentWithPassword.es.ascx
#	Web/Controls/Help/Desktop/Documents/Common/ProtectDocumentWithPassword/ProtectDocumentWithPassword.ru.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/de/ProgramInterface/PluginsTab.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/de/UsageInstructions/FontTypeSizeColor.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/FontTypeSizeColor.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertCharts.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/ParagraphIndents.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/Wordpress.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/ProgramInterface/PluginsTab.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertChart.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/PivotTables.htm
2021-03-31 17:57:54 +03:00
e132c787b5 Structure changes: added Forms section to all new menus, updated links to editors pages in menus, renamed password aspx according to htm, added new pages to sitemap, updated tags 2021-03-30 14:23:37 +03:00
965b9df529 Merge branch 'feature/desktop6.2'
# Conflicts:
#	Web/Controls/Help/ABCIndex/CompleteArticleList.ascx
2021-03-18 12:38:46 +03:00
ae8239c7e0 Revert "Hidden Forms pages for v.6.2 (revert this commit for v.6.3)"
This reverts commit fca2e6c2b4.
2021-03-12 16:35:32 +03:00
0eb4470cc9 Added new videos: communication in docs, pivot tables, document permissions, data validation 2021-03-11 18:18:44 +03:00
273b240c88 Added slicers video 2021-02-24 18:45:40 +03:00
b2facdd641 Added Version History video 2021-02-18 18:23:15 +03:00
0e69f7e4ac Edited site map 2021-02-15 12:03:04 +03:00
04a9be2aa7 Added new links to sitemap, abc-index, tags in languages 2021-02-15 11:33:16 +03:00
f3fd92ea6b Merge branch 'feature/build6.2'
# Conflicts:
#	Web/Controls/Help/ABCIndex/CompleteArticleList.ascx
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/ProgramInterface/PluginsTab.htm
2021-02-15 10:25:57 +03:00
780274ee96 Fixed links to renamed 100017_connect_nextcloud.ascx in sitemap, abc index, web.config and integration pages 2021-02-11 15:27:42 +03:00
1de1f2b1c1 Added 'Uninstall default plugin' articles 2021-02-01 19:13:24 +03:00
fca2e6c2b4 Hidden Forms pages for v.6.2 (revert this commit for v.6.3) 2021-02-01 14:05:43 +03:00
252d741f89 Added videos: pro features, control panel overview 2021-01-22 18:52:50 +03:00
f540ea61d1 Revert "Recommitted due to the github error: can't exit cleanly."
This reverts commit f00e466eb6.

# Conflicts:
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/Functions/unique.htm
2021-01-20 15:28:25 +03:00
fc892a4c2d Merge branch 'feature/build6.2' of https://github.com/ONLYOFFICE/helpcenter into feature/build6.2
# Conflicts:
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/Functions/unique.htm
2021-01-20 15:10:19 +03:00
d660e8aa3a Fixes; updated indexes.js 2021-01-20 15:02:50 +03:00
f00e466eb6 Recommitted due to the github error: can't exit cleanly. 2021-01-20 14:13:45 +03:00
2e6a66abc7 Added 'Private rooms' video, edited tags and sitemap 2021-01-15 13:50:11 +03:00
587e93b1e3 Some fixes and common changes for all languages 2021-01-13 15:48:07 +03:00
a35327f83f Added the 'Audit Trail' and 'Login History' guides to the Control Panel section 2020-12-18 14:56:30 +03:00
2e9534229d Moved headings with links from TableOfContents to index pages (Mobile Web Docs) 2020-11-11 16:36:36 +03:00
dcf224f4e7 Removed duplicate Control Panel guides 2020-11-09 17:33:06 +03:00
SvetlanaLisina
260f32ad5c Сhange of old names Workspace 2020-11-05 14:27:02 +03:00
5fbb84ffbf Merge branch 'editors6.0-new' into feature-structure-new-main-page-2
# Conflicts:
#	Web/Controls/Help/ABCIndex/CompleteArticleList.ascx
#	Web/Controls/Help/Server/Docker/Community/DockerComposeInstallation/DockerComposeInstallation.ascx
#	Web/Controls/Help/Server/Docker/Community/DockerComposeInstallation/DockerComposeInstallation.ru.ascx
#	Web/Controls/Help/Server/Docker/Community/DockerInstallation/DockerInstallation.ascx
#	Web/Controls/Help/Server/Docker/Community/DockerInstallation/DockerInstallation.ru.ascx
#	Web/Controls/Help/Tags/CompleteArticleList.ascx
#	Web/Controls/Help/Tags/edit-documents/edit-documents.ascx
2020-10-13 16:38:51 +03:00
5baa63fd9b Merge branch 'feature/structure' into feature/structure-new
# Conflicts:
#	Web/Controls/Help/ABCIndex/CompleteArticleList.ascx
#	Web/Controls/Help/ArticlesCompleteList/Desktop/100025_pro_features/100025_pro_features.ascx
#	Web/Controls/Help/Server/Docker/Document/DockerInstallation/DockerInstallation.ascx
#	Web/Controls/Help/Server/Docker/Document/DockerInstallation/DockerInstallation.es.ascx
#	Web/Controls/Help/Server/Docker/Document/DockerInstallation/DockerInstallation.ru.ascx
#	Web/Controls/Help/Server/Linux/Document/LinuxInstallationCentOS/LinuxInstallationCentOS.ascx
#	Web/Controls/Help/Server/Linux/Document/LinuxInstallationCentOS/LinuxInstallationCentOS.es.ascx
#	Web/Controls/Help/Server/Linux/Document/LinuxInstallationCentOS/LinuxInstallationCentOS.ru.ascx
#	Web/Controls/Help/Server/Linux/Document/LinuxInstallationEnterprise36/LinuxInstallationEnterprise36.ascx
#	Web/Controls/Help/Server/Linux/Document/LinuxInstallationEnterprise36/LinuxInstallationEnterprise36.es.ascx
#	Web/Controls/Help/Server/Linux/Document/LinuxInstallationEnterprise36/LinuxInstallationEnterprise36.ru.ascx
#	Web/Controls/Help/Server/Windows/Document/AddThemes/AddThemes.ascx
#	Web/Controls/Help/Server/Windows/Document/AddThemes/AddThemes.ru.ascx
#	Web/Controls/Help/SideMenu/Server/CommunityEdition/CommunityEdition.ascx
#	Web/Controls/Help/Tags/local-server/local-server.ascx
#	Web/Controls/Help/Tags/local-server/local-server.de.ascx
#	Web/Controls/Help/Tags/local-server/local-server.es.ascx
#	Web/Controls/Help/Tags/local-server/local-server.fr.ascx
#	Web/Controls/Help/Tags/local-server/local-server.it.ascx
#	Web/Controls/Help/Tags/local-server/local-server.ru.ascx
#	Web/css/help.less
#	Web/server/docker/opensource/deploy-community-edition-in-digitalocean.aspx
#	Web/server/windows/document/install-office-apps.aspx
2020-09-22 11:00:57 +03:00
e995c5f863 Added aspx pages and controls for new htm pages, added links into lists and tags 2020-09-10 17:53:00 +03:00
f9af3d1d29 Added new DS articles to lists 2020-09-01 14:34:59 +03:00
9d9f4ac079 Structure changes 2020-08-11 19:03:24 +03:00
eb0f5c7e47 Structure changes (redirect rules, site map, abc index) 2020-08-07 18:59:44 +03:00
87bfcbcbf0 Merge branch 'feature/remove_articles_E2EE' into feature/version11
# Conflicts:
#	Web/web.config
2020-08-07 10:41:14 +03:00
d3717de2a6 Added a new article - using pro features, changed products versions 2020-07-30 11:26:22 +03:00
f79c5c976f Removed article - Integrating Talk into an IM client 2020-07-29 11:04:07 +03:00
3ddfa1e811 Added videos to pages 2020-07-10 13:42:34 +03:00
96a83ffd04 Removed old articles about End-to-end encryption 2020-07-08 14:27:52 +03:00
18534cd298 Added new article - How to share text documents? 2020-06-29 16:24:29 +03:00
4b3b192869 Added new guide: install Developer Edition using AMI 2020-06-03 16:09:15 +03:00
09d18423a8 Removed links to the 'Installing Document Server as a cluster' article from lists 2020-05-29 18:16:46 +03:00