|
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 |
|
|
93ce29b803
|
Fixed bugs (en)
|
2021-05-17 13:34:36 +03:00 |
|
|
234b7b20d3
|
Renamed the "Theme" section in the English guide.
|
2021-05-05 12:03:51 +03:00 |
|
|
6e6798bad1
|
Hidden Forms (revert later)
|
2021-04-30 14:13:37 +03:00 |
|
|
91af18ff4c
|
Added English and German for new Classic Light theme + minor fixes.
|
2021-04-23 14:56:39 +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 |
|
|
3608739f47
|
German translations + screenshots + controls.
|
2021-03-26 18:59:32 +03:00 |
|
|
f443219c03
|
Added .aspx for password.htm and xlookup.htm + controls in ArticlesCompleteList + corresponding tags + added articles on passwords to main menu for each editor
Included guide on Dark theme into ArticlesCompleteList.
|
2021-03-26 15:05:34 +03:00 |
|
|
ec804128cd
|
English articles for new features in OO Docs + English screenshots.
|
2021-03-22 16:53:42 +03:00 |
|
|
c18947759e
|
Added new articles.
|
2021-03-18 16:27:14 +03:00 |
|
|
1f9b75037a
|
Merge branch 'feature/articles_howto'
# Conflicts:
# Web/Controls/Common/BaseHeader/BaseHeader.ru.ascx
|
2021-03-18 13:03:30 +03:00 |
|
|
840356e97f
|
Fixed formulae-formulas.
|
2021-03-15 14:08:55 +03:00 |
|
|
df4ffe5aaa
|
Changed image path.
|
2021-03-15 13:10:34 +03:00 |
|
|
cac6a83a02
|
Final fixes.
|
2021-03-15 12:06:33 +03:00 |
|
|
660a52b45f
|
Minor fixes as per testing (9/3/21)
|
2021-03-12 17:01:58 +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 |
|
|
c1c3099dfe
|
Fixed icon spacing and added new steps for InsertVideo.ascx
|
2021-03-11 14:34:24 +03:00 |
|
|
39a8e33319
|
Fixed screenshots.
|
2021-03-10 18:51:24 +03:00 |
|
|
d07e33c723
|
Minor fixes as per testing.
|
2021-03-10 15:38:14 +03:00 |
|
|
2b8faebca0
|
Fixes as per testing.
|
2021-03-10 14:12:49 +03:00 |
|
|
84dbe7cfb2
|
Fixed tags in InsertVideo.de.ascx
|
2021-03-02 15:36:02 +03:00 |
|
|
2f88ba4d84
|
Fixed missing bracket in MergeCells.de.ascx
|
2021-03-02 14:59:54 +03:00 |
|
|
9d3280162f
|
Minor fixes (German for watermarks+screenshots, MergeCells two missing brackets)
|
2021-03-02 14:44:49 +03:00 |
|
|
09f94f4ceb
|
Minor fixes.
|
2021-03-02 14:20:13 +03:00 |
|
|
8c91ed8a8d
|
Minor fixes (screenshot size, translating tags, eliminating typos)
|
2021-03-02 13:11:07 +03:00 |
|
|
0c12dda539
|
Edited SwitchBetweenLanguages.ascx (line 25, /div)
|
2021-03-01 18:36:01 +03:00 |
|
|
6af26d1bd3
|
Edited as per comments (articles_howto.docx)
|
2021-03-01 18:15:22 +03:00 |
|
|
7d119082d8
|
Edited InsertVideo.ascx
|
2021-03-01 15:18:44 +03:00 |
|
|
c64594d3cc
|
Edited English screenshots and articles.
|
2021-03-01 15:11:50 +03:00 |
|
|
0719aecab9
|
Added new articles + the corresponding controls + screenshots.
|
2021-02-26 17:36:44 +03:00 |
|
|
0adf61240f
|
Added new articles and their translation into German.
|
2021-02-24 14:44:53 +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 |
|
|
d398ea36d5
|
Merge branch 'features/user_guides_german'
# Conflicts:
# Web/Controls/Help/Installation/Desktop.ascx
# Web/OfficeWeb/apps/presentationeditor/main/resources/help/de/ProgramInterface/PluginsTab.htm
# Web/images/Help/de/Mobile/Documents/Spreadsheets/popupmenu_deletesheet.png
|
2021-02-17 14:35:30 +03:00 |
|
|
81f155086e
|
Added German for PE for Android + screenshots + edited English articles (typo)
|
2021-02-16 18:25:56 +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 |
|
|
fca2e6c2b4
|
Hidden Forms pages for v.6.2 (revert this commit for v.6.3)
|
2021-02-01 14:05:43 +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 |
|
|
f1f73e7c63
|
Merge branch 'feature/user_guides_german' into features/user_guides_german
# Conflicts:
# Web/Controls/Help/MobApps/MobDocs/DocumentEditor/ParagraphFormatting/AlignTextInParagraph/AlignTextInParagraph.de.ascx
# Web/Controls/Help/MobApps/MobDocs/DocumentEditor/ParagraphFormatting/ApplyFormattingPresets/ApplyFormattingPresets.de.ascx
# Web/Controls/Help/MobApps/MobDocs/DocumentEditor/TextFormatting/AddHyperlinks/AddHyperlinks.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/CellTextFormatting/SEFontTypeSizeColor/SEFontTypeSizeColor.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/CellTextFormatting/SEHyperlink/SEHyperlink.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/EditingCellProperties/AddCellBorders/AddCellBorders.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/EditingCellProperties/ApplyCellStyle/ApplyCellStyle.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/EditingCellProperties/CellBackgroundColor/CellBackgroundColor.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/EditingCellProperties/FormatAsTableTemplate/FormatAsTableTemplate.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/EditingCellProperties/MergeCells/MergeCells.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/EditingCellProperties/SEAlignData/SEAlignData.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/EditingCellProperties/SENumberFormat/SENumberFormat.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/EditingCellProperties/WrapText/WrapText.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/OperationsOnObjects/InsertFormulas/InsertFormulas.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/OperationsOnObjects/SEInsertAutoshapes/SEInsertAutoshapes.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/OperationsOnObjects/SEInsertCharts/SEInsertCharts.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/OperationsOnObjects/SEInsertImages/SEInsertImages.de.ascx
# Web/images/Help/de/Mobile/Documents/Presentations/bordertype.png
# Web/images/Help/de/Mobile/Documents/Presentations/chart_style.png
# Web/images/Help/de/Mobile/Documents/Presentations/chart_type.png
# Web/images/Help/de/Mobile/Documents/Presentations/popupmenu_select.png
# Web/images/Help/de/Mobile/Documents/Presentations/shape_style.png
# Web/images/Help/de/Mobile/Documents/Presentations/shape_with_text.png
# Web/images/Help/de/Mobile/Documents/Presentations/styleoptions.png
# Web/images/Help/de/Mobile/Documents/Presentations/tablefill.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/cell_selection_handles.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/cellstyles.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/column_selection_handles.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/externallink.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/filterwindow.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/internallink.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/popupmenu_copy.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/popupmenu_deletesheet.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/save.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/search_panel.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/search_replace_panel.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/select_whole_sheet.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/shape_style.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/shape_with_text.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/sheet_navigation_panel.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/tablestyles.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/text_in_formula_bar.png
# Web/images/Help/de/Mobile/Documents/Spreadsheets/text_selection_handles_cell.png
# Web/images/Help/de/Mobile/Documents/charteditor.png
# Web/images/Help/de/Mobile/Documents/insertlink.png
# Web/images/Help/de/Mobile/Documents/paragraph_advanced.png
# Web/images/Help/de/Mobile/Documents/popupmenu_copy.png
# Web/images/Help/de/Mobile/Documents/popupmenu_select.png
# Web/images/Help/de/Mobile/Documents/save.png
# Web/images/Help/de/Mobile/Documents/search_panel.png
# Web/images/Help/de/Mobile/Documents/search_replace_panel.png
# Web/images/Help/de/Mobile/Documents/shape_style.png
# Web/images/Help/de/Mobile/Documents/styleoptions.png
# Web/images/Help/de/Mobile/Documents/textsettingspanel.png
|
2021-01-15 13:45:49 +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 |
|
|
a8d54755ee
|
Added translations for Editors Guides - Adding fonts and Creating indents.
|
2020-12-30 18:19:19 +03:00 |
|
|
c58c98100a
|
Added the View tab and updated screenshots in older tabs and articles
|
2020-11-09 12:41:22 +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 |
|
|
1a6f6ae738
|
Userguides docs: guides, added video-support article, ArticleCompleteList articles renamed
|
2020-10-06 18:42:22 +03:00 |
|
|
53c515a803
|
Merge branch 'plugins' into editors6.0-new
# Conflicts:
# Web/Controls/Help/Tags/CompleteArticleList.ascx
# Web/OfficeWeb/apps/documenteditor/main/resources/help/en/ProgramInterface/PluginsTab.htm
# Web/OfficeWeb/apps/documenteditor/main/resources/help/en/ProgramInterface/ProgramInterface.htm
# Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/UsageInstructions/InsertSymbols.htm
# Web/OfficeWeb/apps/documenteditor/main/resources/help/ru/UsageInstructions/InsertSymbols.htm
# Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/UsageInstructions/InsertSymbols.htm
# Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/ProgramInterface/PluginsTab.htm
# Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertSymbols.htm
# Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertSymbols.htm
|
2020-10-02 12:28:38 +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 |
|
|
a386cc5a1a
|
Changes in articles
|
2020-07-21 16:31:48 +03:00 |
|
|
f5bf9482ab
|
Added Plugins as a section
|
2020-07-14 16:42:42 +03:00 |
|