|
|
d1692f35dc
|
Merge branch 'feature/docs-centos' into develop
|
2022-11-18 16:52:57 +03:00 |
|
|
|
dbe1b52d66
|
Merge branch 'feature/twitter' into develop
|
2022-11-18 16:52:41 +03:00 |
|
|
|
8d79a3f538
|
Merge branch 'feature/issue35' into develop
|
2022-11-18 16:49:12 +03:00 |
|
|
|
be4dbfa99c
|
Merge branch 'feature/issue32' into develop
|
2022-11-18 16:48:57 +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 |
|
|
|
69b76ef137
|
Merge branch 'feature/issue29' into develop
|
2022-11-18 16:41:08 +03:00 |
|
|
|
b0f421e902
|
Merge branch 'feature/issue33' into develop
# Conflicts:
# Web/Controls/Help/GettingStarted/Integration/Plone/GettingStartedPlone.ascx
|
2022-11-14 13:16:16 +03:00 |
|
|
|
2ce5242216
|
Merge branch 'feature/plone' into develop
# Conflicts:
# Web/Controls/Help/GettingStarted/Integration/Nextcloud/GettingStartedNextcloud.de.ascx
|
2022-11-14 13:09:12 +03:00 |
|
|
|
d163264fad
|
Merge branch 'feature/moodle_2.2.0' into develop
|
2022-11-14 13:05:48 +03:00 |
|
|
|
c82820b012
|
Fix AndrSETableOfContents.ascx
|
2022-11-14 12:29:39 +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 |
|
|
|
e7613f206e
|
Merge branch 'feature/web-apps-fixes' into develop
|
2022-11-14 10:42:56 +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 |
|
trovier
|
89c532fe12
|
German Personal updated.
|
2022-11-11 18:16:45 +03:00 |
|
|
|
aa76d763a8
|
Fix #35 (some fixes)
|
2022-11-11 11:13:38 +03:00 |
|
|
|
99e6021be7
|
Fix #35 (payment methods for countries)
|
2022-11-10 19:00:34 +03:00 |
|
|
|
916d029b09
|
Fix #35 (fixes for countries)
|
2022-11-10 18:24:38 +03:00 |
|
|
|
9b5f55953c
|
Fix bug 59672
|
2022-11-10 17:16:08 +03:00 |
|
|
|
1460e7acb9
|
Fix #40 (LinuxInstallationCentOS.de.ascx + es, fr, it; LinInstallCentOSARM.ascx + de, fr)
|
2022-11-10 15:32:30 +03:00 |
|
|
|
250849a267
|
Update Workspace version
|
2022-11-10 14:10:09 +03:00 |
|
|
|
823a644d02
|
Fix #35
|
2022-11-10 13:59:19 +03:00 |
|
|
|
a9cb5709d7
|
Fix #39
|
2022-11-09 15:00:25 +03:00 |
|
|
|
8bd41d3bb1
|
Merge pull request #38 from ONLYOFFICE/feature/editing-OOEditors
Feature/editing oo editors
|
2022-11-09 12:50:05 +03:00 |
|
|
|
adf5cdd466
|
Merge pull request #37 from ONLYOFFICE/feature/editing_MobApps
Feature/editing mob apps
|
2022-11-09 12:28:42 +03:00 |
|
|
|
c736e21802
|
Merge pull request #34 from ONLYOFFICE/feature/config-docs-7.2.1
Config docs 7.2.1
|
2022-11-09 12:02:03 +03:00 |
|
|
|
29851a779a
|
Remove AndrWebPETableOfContents.ascx in languages
|
2022-11-09 10:35:06 +03:00 |
|
|
|
4c38a95043
|
Merge branch 'develop' into feature/editing_MobApps
# Conflicts:
# Web/Controls/Help/MobApps/MobDocs/CommonOperations/OpenCreateFiles/OpenCreateFiles.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/DocumentEditor/BasicOperations/NavigateDocument/NavigateDocument.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPEToolsAndSettings/AndrWebMacros/AndrWebMacros.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebSE/iOSWebSETableOfContents/iOSWebSETableOfContents.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/MobileDocsOverview/MobileDocsOverview.fr.ascx
# Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PESlideParameters/ChangeSlideBackground/ChangeSlideBackground.fr.ascx
|
2022-11-08 19:04:41 +03:00 |
|
|
|
e5393b3493
|
Fix HelpCenter.fr.ascx
|
2022-11-08 18:55:36 +03:00 |
|
|
|
975641a499
|
Edit font-formatting.ascx and other tags
|
2022-11-08 18:27:55 +03:00 |
|
|
|
d83f8a491f
|
edited HelpCenter.fr.ascx
|
2022-11-07 18:58:33 +03:00 |
|
|
|
8fb8c031b9
|
Fix commands
|
2022-11-07 17:47:58 +03:00 |
|
|
|
4d9f2389d3
|
replaced images for TOC
|
2022-11-07 11:08:12 +03:00 |
|
|
|
8bff462712
|
Update LinuxInstallationCentOS.ascx
|
2022-11-03 17:33:33 +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 |
|
|
|
2603116ef4
|
edited fr
|
2022-11-02 12:03:56 +03:00 |
|
|
|
f67d81cb90
|
edited fr
|
2022-11-01 18:18:40 +03:00 |
|
|
|
b097052d6f
|
Fix #29 - remove space
|
2022-11-01 14:29:59 +03:00 |
|
|
|
4446ae633f
|
Edit page-formatting.ascx, footnotes.ascx, endnotes.ascx
|
2022-11-01 14:24:02 +03:00 |
|
|
|
3b05f74a84
|
added fr
|
2022-10-31 18:12:48 +03:00 |
|
|
|
2145c73890
|
added fr
|
2022-10-31 16:12:02 +03:00 |
|
|
|
44bab92544
|
edited fr
|
2022-10-28 18:05:38 +03:00 |
|
|
|
7e55d0ba7c
|
added/edited fr
|
2022-10-28 18:01:40 +03:00 |
|
|
|
e0e57e8cd5
|
edited fr
|
2022-10-28 14:04:48 +03:00 |
|
|
|
60da67febe
|
edited fr
|
2022-10-27 18:23:21 +03:00 |
|
|
|
c79cf07ca8
|
edited fr (All editors)
|
2022-10-26 18:14:29 +03:00 |
|
