Commit Graph

171 Commits

Author SHA1 Message Date
0a1f4b1e68 Merge branch 'feature/custom_theme' into feature/docs-7.0 2021-12-06 12:06:08 +03:00
481cbd1cd5 Add new and update existing articles for 7.0 2021-12-03 18:18:12 +03:00
SvetlanaLisina
9ca1715c7e bugfix links 2021-11-24 19:03:33 +03:00
SvetlanaLisina
2e91699feb fix integration 2021-11-24 19:02:42 +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
9321d8562d фикс прекомпиляции хелпцентра 2021-11-24 18:51:05 +03:00
03747acf32 Merge branch 'feature/add-video' into release/1.2.0 2021-11-24 18:24:17 +03:00
894bff0f80 Update DS version 2021-11-23 17:13:21 +03:00
4898f75032 Update Download link for Integration pages 2021-10-22 18:33:04 +03:00
2fefc00c9a Add new videos, add new sections to Video.ascx 2021-10-15 15:01:45 +03:00
87494b430d Merge branch 'feature/mob_projects_android' into release/1.0.0 2021-10-07 19:02:25 +03:00
2a4a61d1fc Merge branch 'feature/desktop_6.4' into release/1.0.0 2021-10-07 18:54:56 +03:00
32bfca3014 Updated workspace version 2021-09-15 19:28:20 +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
318afc176a Added DocsDE/EEArticles.master, updated CPPageButtons.ascx (for previous commit); Fixed button for SaaS articles 2021-08-30 16:07:21 +03:00
3a77447b96 Added anchors (#docs-community, #docs-enterprise, #docs-developer, #workspace-community, #workspace-enterprise) 2021-08-30 15:48:17 +03:00
4b7271a392 Updated download links for Installation articles; fixed outdated ADFS link 2021-08-30 12:56:52 +03:00
bb1c2cc227 Added Download button for Android projects 2021-07-23 17:49:08 +03:00
2d623f1a93 Updated Desktop Editors changelog and version 2021-07-21 14:09:04 +03:00
b6dfb6e86d Added new masters, index page, side menu, add new pages to lists 2021-07-20 13:16:36 +03:00
e24b419a94 Updated DSChangelog.ascx and version number 2021-07-14 16:15:50 +03:00
a2b6b6c5bf Added Desktop changelog v6.3.1, updated Desktop version control 2021-07-01 18:38:43 +03:00
e4e415272e Ver.6: Fixes for LocalizeControls. 2021-06-09 18:53:34 +03:00
edd080477f Ver.4: Fixes for headers, buttons, articles. 2021-06-09 17:30:46 +03:00
531ed4cd70 Merge remote-tracking branch 'remotes/origin/master' into feature/user_guides_german_3
# Conflicts:
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/Plugins/Plugins.de.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/de/HelpfulHints/About.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/de/HelpfulHints/SupportedFormats.htm
2021-06-07 15:17:45 +03:00
c75ca25023 Ver.1: Fixes for all user guides in German. 2021-06-03 17:37:41 +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
b72036222f Updated Docs changelog (v6.2.1, 6.2.2), removed dots in version numbers 2021-04-30 15:54:19 +03:00
23899d2c7a Added FR translations, controls, links in menus, updated indexes 2021-04-30 11:55:29 +03:00
97a6e7cda4 Updated sidemenu and other lists for new pages; added 2 images (de); minor text fix in CreateFillableForms.htm 2021-04-15 19:24:28 +03:00
5e73b086fc Removed dots after 'v' in product versions, updated Workspace version 2021-04-08 13:20:25 +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
75b75af649 Added Changelog for Docs 6.3, updated Docs version 2021-03-30 15:18:49 +03:00
3686e27c26 Changed Community Server version to 11.1 2021-03-18 12:49:44 +03:00
965b9df529 Merge branch 'feature/desktop6.2'
# Conflicts:
#	Web/Controls/Help/ABCIndex/CompleteArticleList.ascx
2021-03-18 12:38:46 +03:00
74a12bacec Merge remote-tracking branch 'remotes/origin/feature/ru_translations'
# Conflicts:
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/ru/ProgramInterface/PluginsTab.htm
#	Web/css/common.less
2021-02-24 12:23:28 +03:00
c8857b1eb8 Edited TranslatorAttention.ascx 2021-02-16 12:33:12 +03:00
8671e7c54e Updated Desktop Editors version to 6.2 2021-02-11 19:04:28 +03:00
177980755d Added translations for Main sections, Sidemenu, DownloadButtons, Video, and Desktop mac OS Installation article (ru)
# Conflicts:
#	Web/Controls/Help/ArticlesCompleteList/ControlPanel/90021_full_text_search/90021_full_text_search.ru.ascx
#	Web/Controls/Help/ArticlesCompleteList/ControlPanel/90033_ce_encryption/90033_ce_encryption.ru.ascx
#	Web/Controls/Help/ArticlesCompleteList/ControlPanel/90034_ce_full_text_search/90034_ce_full_text_search.ru.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/ru/ProgramInterface/ReferencesTab.htm
2021-02-11 17:42:48 +03:00
88851c0b5c Minor text fixes (UserGuides)
# Conflicts:
#	Web/Controls/Help/UserGuides/WorkspaceMail.ascx
2021-02-11 17:41:01 +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
f00e466eb6 Recommitted due to the github error: can't exit cleanly. 2021-01-20 14:13:45 +03:00
357391b3ee Updated Docs version to 6.2 2021-01-19 14:32:46 +03:00
ee02265628 Edited InsertContentControls.htm, added CreateFillableForms.htm and all corresponding controls + created new section for fillable forms. 2021-01-12 14:45:14 +03:00
4b7411fad6 Changed Workspace version, added CP changelog for Workspace guides 2020-12-21 11:34:57 +03:00
b56cac5fa9 Updated CS, CP changelogs, added a link to github for CP 2020-12-10 15:03:52 +03:00
3fd9be0787 Added Talk Changelog 2020-12-10 14:46:25 +03:00
576c1658e9 Changed left menu for the search page 2020-12-09 18:47:04 +03:00
3eb54117ef Updated Changelog for Desktop Editors v 6.1; updated Desktop Editors current version 2020-12-03 15:46:17 +03:00
cdf6dda3c0 Merge branch 'feature/build6.1' 2020-12-02 11:44:42 +03:00