|
|
1d145f3dbf
|
Merge branch 'feature/Docs-Cloud' into develop
# Conflicts:
# Web/Controls/Help/GettingStarted/Integration/Jira/GettingStartedJira.ascx
# Web/Controls/Help/GettingStarted/Integration/Redmine/RedmineGettingStarted.ascx
|
2022-12-14 12:57:20 +03:00 |
|
|
|
d205f57d13
|
Add DocsCloudRegistration.fr.ascx
|
2022-12-08 10:54:17 +03:00 |
|
|
|
f19741c5b9
|
edited fr
|
2022-11-28 17:30:02 +03:00 |
|
|
|
abb963cd46
|
Add new article, new section and fixes for Docs Cloud
|
2022-11-23 15:44:04 +03:00 |
|
|
|
0bbda1b219
|
Merge branch 'feature/issue31' into develop
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.es.resx
# Web/App_GlobalResources/Resource.fr.resx
# Web/App_GlobalResources/Resource.resx
|
2022-11-18 16:48:02 +03:00 |
|
|
|
9adeed9022
|
Merge branch 'feature/structure-fixes' into develop
# Conflicts:
# 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/Controls/Help/ABCIndex/ABCCompleteArticleList.ascx
# Web/Controls/Help/MobApps/MobDocs/DocumentEditor/DocumentEditorTableOfContents/DocumentEditorTableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/DocumentEditor/DocumentEditorTableOfContents/DocumentEditorTableOfContents.es.ascx
# Web/Controls/Help/MobApps/MobDocs/DocumentEditor/DocumentEditorTableOfContents/DocumentEditorTableOfContents.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/DocumentEditor/DocumentEditorTableOfContents/DocumentEditorTableOfContents.ru.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.es.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.ru.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.es.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.ru.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.es.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.ru.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrToolsAndSettings/AndrChangeSpreadsheetSettings/AndrChangeSpreadsheetSettings.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebDE/AndrWebDETableOfContents/AndrWebDETableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebDE/AndrWebDETableOfContents/AndrWebDETableOfContents.es.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebDE/AndrWebDETableOfContents/AndrWebDETableOfContents.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebDE/AndrWebDETableOfContents/AndrWebDETableOfContents.ru.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebPE/AndrWebPETableOfContents/AndrWebPETableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebPE/AndrWebPETableOfContents/AndrWebPETableOfContents.es.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebPE/AndrWebPETableOfContents/AndrWebPETableOfContents.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebPE/AndrWebPETableOfContents/AndrWebPETableOfContents.ru.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebSE/AndrWebSETableOfContents/AndrWebSETableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebSE/AndrWebSETableOfContents/AndrWebSETableOfContents.es.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebSE/AndrWebSETableOfContents/AndrWebSETableOfContents.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebSE/AndrWebSETableOfContents/AndrWebSETableOfContents.ru.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebDE/iOSWebDETableOfContents/iOSWebDETableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebDE/iOSWebDETableOfContents/iOSWebDETableOfContents.es.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebDE/iOSWebDETableOfContents/iOSWebDETableOfContents.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebDE/iOSWebDETableOfContents/iOSWebDETableOfContents.ru.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebPE/iOSWebPETableOfContents/iOSWebPETableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebPE/iOSWebPETableOfContents/iOSWebPETableOfContents.es.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebPE/iOSWebPETableOfContents/iOSWebPETableOfContents.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebPE/iOSWebPETableOfContents/iOSWebPETableOfContents.ru.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebSE/iOSWebSETableOfContents/iOSWebSETableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebSE/iOSWebSETableOfContents/iOSWebSETableOfContents.es.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebSE/iOSWebSETableOfContents/iOSWebSETableOfContents.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebSE/iOSWebSETableOfContents/iOSWebSETableOfContents.ru.ascx
# Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PresentationEditorTableOfContents/PresentationEditorTableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PresentationEditorTableOfContents/PresentationEditorTableOfContents.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PresentationEditorTableOfContents/PresentationEditorTableOfContents.ru.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/SpreadsheetEditorTableOfContents/SpreadsheetEditorTableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/SpreadsheetEditorTableOfContents/SpreadsheetEditorTableOfContents.es.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/SpreadsheetEditorTableOfContents/SpreadsheetEditorTableOfContents.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/SpreadsheetEditorTableOfContents/SpreadsheetEditorTableOfContents.ru.ascx
# Web/Controls/Help/Tags/TagsCompleteArticleList.ascx
# Web/Controls/Help/Tags/page-margins/page-margins.ascx
# Web/Controls/Help/Tags/page-margins/page-margins.de.ascx
# Web/Controls/Help/Tags/page-margins/page-margins.es.ascx
# Web/Controls/Help/Tags/page-margins/page-margins.fr.ascx
# Web/Controls/Help/Tags/page-margins/page-margins.it.ascx
# Web/Controls/Help/Tags/page-margins/page-margins.ru.ascx
# Web/Controls/Help/Tags/page-orientation/page-orientation.ascx
# Web/Controls/Help/Tags/page-orientation/page-orientation.de.ascx
# Web/Controls/Help/Tags/page-orientation/page-orientation.es.ascx
# Web/Controls/Help/Tags/page-orientation/page-orientation.fr.ascx
# Web/Controls/Help/Tags/page-orientation/page-orientation.it.ascx
# Web/Controls/Help/Tags/page-orientation/page-orientation.ru.ascx
# Web/Controls/Help/Tags/page-size/page-size.ascx
# Web/Controls/Help/Tags/page-size/page-size.de.ascx
# Web/Controls/Help/Tags/page-size/page-size.es.ascx
# Web/Controls/Help/Tags/page-size/page-size.fr.ascx
# Web/Controls/Help/Tags/page-size/page-size.it.ascx
# Web/Controls/Help/Tags/page-size/page-size.ru.ascx
|
2022-11-14 12:15:47 +03:00 |
|
|
|
49112c908e
|
Merge branch 'feature/android-5.5.0' into develop
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.resx
# Web/Controls/Help/ArticlesCompleteList/MobileApps/4338_mob_andr_endnotes.de.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrOperationsOnObjects/AndrAdjustChartSettings/AndrAdjustChartSettings.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrToolsAndSettings/AndrSaveExportPrintDoc/AndrSaveExportPrintDoc.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPEOperationsOnObjects/AndrPEAdjustChartSettings/AndrPEAdjustChartSettings.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrToolsAndSettings/AndrChangeSpreadsheetSettings/AndrChangeSpreadsheetSettings.fr.ascx
|
2022-11-14 11:29:46 +03:00 |
|
|
|
da589b70d7
|
Merge branch 'feature/help_fixes' into develop
# Conflicts:
# 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/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrCellTextFormatting/AndrSEFontTypeSizeColor/AndrSEFontTypeSizeColor.fr.ascx
# Web/Controls/Help/ONLYOFFICEEditors/EditorsUserGuides/SpreadsheetEditor/FreezeRowsColumns/FreezeRowsColumns.fr.ascx
# Web/Controls/Help/Tags/TagsCompleteArticleList.ascx
|
2022-11-14 10:42:10 +03:00 |
|
|
|
975641a499
|
Edit font-formatting.ascx and other tags
|
2022-11-08 18:27:55 +03:00 |
|
|
|
153ac52a12
|
Edit paragraph-formatting.ascx and other tags
|
2022-11-03 16:17:39 +03:00 |
|
trovier
|
db64127d4e
|
Fixed resource.de
|
2022-11-02 17:15:16 +03:00 |
|
trovier
|
eb2f17a724
|
Merge branch 'feature/help_fixes' of https://github.com/ONLYOFFICE/helpcenter into feature/help_fixes
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
|
2022-11-02 17:02:18 +03:00 |
|
trovier
|
ed375c5f18
|
German fixes + minor English fixes (typos).
|
2022-11-02 16:55:45 +03:00 |
|
|
|
c3e589e3eb
|
Edit several tags
|
2022-11-02 16:26:50 +03:00 |
|
|
|
4446ae633f
|
Edit page-formatting.ascx, footnotes.ascx, endnotes.ascx
|
2022-11-01 14:24:02 +03:00 |
|
|
|
c96fa6ef10
|
Add docs-community-https-windows.aspx
|
2022-10-25 14:33:21 +03:00 |
|
|
|
29613b3269
|
Edit several tags
|
2022-10-25 12:01:47 +03:00 |
|
|
|
97e56f7e66
|
Edit operations-with-files.ascx tag
|
2022-10-24 17:18:37 +03:00 |
|
|
|
10bfae6e9f
|
Merge branch 'feature/android-5.5.0' into feature/structure-fixes
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.resx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.de.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.de.ascx
|
2022-10-21 16:12:17 +03:00 |
|
trovier
|
fb2e843256
|
German translation updated (complete).
|
2022-10-17 18:12:29 +03:00 |
|
|
|
9b5fe7a64a
|
Edit onlyoffice-online-editor-settings.ascx tag, remove unnecessary files
|
2022-10-05 13:43:14 +03:00 |
|
|
|
628816d967
|
Edit Sidemenu and Resource.fr.resx
|
2022-10-03 18:16:27 +03:00 |
|
|
|
c6d8c16548
|
Updates for Android
|
2022-10-03 12:23:33 +03:00 |
|
|
|
c8573f69c9
|
Merge remote-tracking branch 'remotes/origin/feature/userguides_rework' into release/1.7.0
|
2022-09-26 17:52:03 +03:00 |
|
|
|
52ea9a8be2
|
Merge branch 'feature/web-apps-help' of https://github.com/ONLYOFFICE/helpcenter into feature/web-apps-help
|
2022-09-21 19:14:54 +03:00 |
|
|
|
28b50e4f3d
|
edit fr
|
2022-09-21 19:14:18 +03:00 |
|
|
|
befe52a34a
|
Build 7.2: German translation updated.
|
2022-09-21 18:06:03 +03:00 |
|
|
|
c7f00d6f86
|
edit fr
|
2022-09-20 12:04:09 +03:00 |
|
|
|
5c99bbc7eb
|
Build 7.2: German translation updated.
|
2022-09-19 15:45:10 +03:00 |
|
|
|
f35aee6360
|
Build 7.2: minor fixes, screenshots updated (EN+DE)
|
2022-09-15 18:07:36 +03:00 |
|
|
|
0969690e43
|
iOS doc: add ru FileEncryption, update tags
|
2022-09-14 17:31:43 +03:00 |
|
|
|
aae3b54e38
|
edit fr
|
2022-09-14 16:05:51 +03:00 |
|
|
|
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 |
|
|
|
f8b680f248
|
Initial rework commit, EN only.
|
2022-08-24 17:03:22 +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 |
|
