Commit Graph

90 Commits

Author SHA1 Message Date
08c8450d97 Merge branch 'feature/web-apps-help' of https://github.com/ONLYOFFICE/helpcenter into feature/web-apps-help 2022-09-13 18:28:07 +03:00
91b1646cf9 edit fr 2022-09-13 18:27:29 +03:00
123f2e73ca Add Ru translation to Configuring JWT article, update tags, minor fixes 2022-09-13 18:14:17 +03:00
870eb18d59 Update translations (ru) 2022-09-13 13:26:16 +03:00
0f31940864 Build 7.2: mobile web editors for Android, Part 3; update sharing page (common for Android and iOS) - en, ru 2022-09-12 18:09:54 +03:00
7daa5a5217 Build 7.2: Plugin manager, hyperlink to local file. 2022-09-12 17:36:10 +03:00
fcf892107c Build 7.2: mobile web editors for Android, part 1 2022-09-09 10:57:20 +03:00
8d61ffe4da Build 7.2: iOS handwriting recognition; minor fixes. 2022-08-30 16:45:01 +03:00
c5ab0490c2 Build 7.2: fixes for iOS Documents, minor fixes for editors, JWT as a standalone article (EN+DE). 2022-08-29 18:23:09 +03:00
5817c3316a Build 7.2: new features, iOS update (DE+FR). 2022-08-26 17:47:04 +03:00
0a9419513f Build 7.2: new features, iOS update (EN only). 2022-08-26 17:46:06 +03:00
1730ad8322 Fixes for UserGuides pages 2022-08-09 11:54:14 +03:00
3c2c03cc1a Some fixes 2022-08-03 17:52:15 +03:00
e6a632186d Merge branch 'feature/translations-fr-new' into release/1.6.0
# Conflicts:
#	Web/AdministratorGuides/Mass-mailing.aspx
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.es.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.it.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/App_GlobalResources/Resource.ru.resx
#	Web/Controls/Help/ArticlesCompleteList/DeveloperEdition/150017_change_themes_de.de.ascx
#	Web/Controls/Help/Installation/Desktop.de.ascx
#	Web/Controls/Help/Installation/Installation.ascx
#	Web/Controls/Help/Installation/Installation.de.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.de.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.es.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.fr.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.ru.ascx
#	Web/Controls/Help/Tags/add-event/add-event.de.ascx
#	Web/Controls/Help/Tags/change-color/change-color.ascx
#	Web/Controls/Help/Tags/change-color/change-color.de.ascx
#	Web/Controls/Help/Tags/change-color/change-color.es.ascx
#	Web/Controls/Help/Tags/create-event/create-event.de.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.de.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.es.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.fr.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.it.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.ru.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.de.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.fr.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.ru.ascx
#	Web/Controls/Help/UserGuides/DocsSE.ascx
#	Web/Controls/Help/UserGuides/DocsSE.de.ascx
#	Web/Controls/Help/UserGuides/DocsSE.fr.ascx
#	Web/Controls/Help/UserGuides/DocsSE.it.ascx
#	Web/Controls/Help/UserGuides/DocsSE.ru.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/GroupsDocuments.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.de.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.fr.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.ru.ascx
2022-08-02 17:14:15 +03:00
32f1d0849e Merge branch 'feature/fix-merge-cells' into release/1.6.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/UsageInstructions/MergeCells.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/MergeCells.htm
2022-08-02 16:12:29 +03:00
ab7aac6ed8 Edit several UserGuides index pages 2022-08-01 15:13:02 +03:00
d50185a51b Edit DE, SE, PE index pages 2022-07-31 15:25:38 +03:00
b4de073563 Finish editing controls for Video.ascx 2022-07-31 14:39:17 +03:00
1c0b4aa46c Continue editing controls for Video.ascx 2022-07-29 17:53:56 +03:00
c5889817de Start editing controls for Video.ascx 2022-07-28 18:48:15 +03:00
39000d005b Merge branch 'feature/new_german' into release/1.6.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
2022-07-28 15:05:02 +03:00
9262be26e3 Edit index pages for mobile apps 2022-07-27 14:36:53 +03:00
333e5241a1 Edit tags for InsertTables.aspx 2022-07-22 14:27:12 +03:00
396d05845a .resx: DE added, EN minor fix. 2022-07-17 22:17:03 +03:00
13f97f4089 Start editing mobile pages 2022-07-16 21:31:56 +03:00
93e389e9ed Edit tags for pages from Editing cell properties section 2022-07-15 17:28:45 +03:00
8bd87f869e Add translations for Android Projects (fr) 2022-07-15 11:57:15 +03:00
55ca46d2a9 Try to edit CellProperties.ascx 2022-07-14 19:23:43 +03:00
a30649c967 Edit download buttons 2022-07-14 16:00:21 +03:00
1f2ae5a460 Edit align-text.ascx tag 2022-07-12 17:42:24 +03:00
37f049a993 Add new translations 2022-07-12 13:12:49 +03:00
e24416bf4e Add and update translations - fr 2022-07-08 17:37:39 +03:00
bc58f5d40d Add translations fr 2022-07-08 12:56:39 +03:00
7e2191aa30 Edit cell-formatting.ascx tag 2022-07-06 17:26:16 +03:00
779f776f45 Merge branch 'feature/google-workspace' into develop
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2022-07-06 10:26:14 +03:00
e9a474633d Edit operations-with-cells.ascx tag 2022-07-05 16:55:34 +03:00
ae77cc3a48 Merge branch 'feature/integration-fr' into develop
# Conflicts:
#	Web/App_GlobalResources/Resource.fr.resx
2022-07-05 10:57:41 +03:00
b785b52d0e Update translations (fr, Installation, Docs) 2022-07-01 12:55:34 +03:00
93e6a0a668 New article - Migrating Google Workspace data to ONLYOFFICE Workspace 2022-06-16 17:48:34 +03:00
1966576c66 Some fixes 2022-06-15 14:58:46 +03:00
165a372a34 Edit sitemap, structure fixes 2022-06-14 16:51:19 +03:00
654426af32 Continue updating sitemaps 2022-06-10 18:31:32 +03:00
57984e8494 Continue updating sitemaps, structure fixes 2022-06-09 18:14:42 +03:00
08947360aa Edit main sections order - SiteMap.ascx 2022-06-09 12:26:54 +03:00
869bfe603e Continue editing sitemaps and structure fixes 2022-06-08 18:35:08 +03:00
8ceeeebb9f Some more structure fixes for editors pages 2022-05-09 19:18:34 +03:00
8d71664100 Merge branch 'feature/helpcenter_12.0-for-release' into release/1.4.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/Controls/Help/HelpCenter.de.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.it.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.ru.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ToolsAndSettings/ToolsAndSettingsDocument.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ToolsAndSettings/ToolsAndSettingsDocument.it.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/OperationsOnObjects/PEOperationsOnObjects.de.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/OperationsOnObjects/PEOperationsOnObjects.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.de.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.it.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/SpreadsheetEditor/OperationsOnObjects/SEOperationsOnObjects.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/SpreadsheetEditor/OperationsOnObjects/SEOperationsOnObjects.it.ascx
#	Web/Controls/Help/VariousControls/LocalizeControls/SpreadsheetProtection/LocalizeSpreadsheetProtection.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Review.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/images/acceptreject_dropdown.png
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
2022-05-09 17:02:25 +03:00
70b16b8db0 Structure fix for editors pages 2022-05-09 14:06:35 +03:00
0320d8447c Fix PdfViewer.htm 2022-05-07 11:37:58 +03:00
288ed2a03c Fixes for new arm articles 2022-05-06 12:43:37 +03:00