Commit Graph

3916 Commits

Author SHA1 Message Date
2a8f6ca7ee Update Docker commands for Community Server 2022-12-26 12:15:24 +03:00
f606f16129 Update system requirements for Docker (RAM 4 GB) 2022-12-22 11:24:41 +03:00
d8a9905c60 Update DSChangelog.ascx for v7.2.2 2022-12-22 10:42:55 +03:00
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
850a362bf5 Merge branch 'feature/redmine' into develop 2022-12-14 12:43:07 +03:00
da08973e89 Merge branch 'feature/jira' into develop 2022-12-14 12:42:46 +03:00
e810aa0ae8 Merge branch 'feature/issue42' into develop 2022-12-14 12:42:25 +03:00
ae52003231 Minor fixes - Glossary.fr.ascx 2022-12-13 16:38:36 +03:00
4cd90770da Fix links 2022-12-09 16:55:53 +03:00
ce79704e06 For issue #42 (other languages and articles) 2022-12-09 16:42:41 +03:00
b94029a334 For issue #42 (en only) 2022-12-08 17:54:14 +03:00
e2fb67795e For bug 32766 2022-12-08 15:16:02 +03:00
3c5fe8d4bc Remove unused controls 2022-12-08 12:16:27 +03:00
d205f57d13 Add DocsCloudRegistration.fr.ascx 2022-12-08 10:54:17 +03:00
d975b6e3b4 Fixes for RedmineGettingStarted.ascx 2022-12-06 10:22:24 +03:00
07f5d49254 edited fr 2022-12-05 18:12:21 +03:00
7459591d5c edited fr 2022-12-02 19:08:12 +03:00
dc6315ed8a edited fr 2022-12-02 17:29:51 +03:00
96ac32f055 edited fr 2022-12-01 17:36:27 +03:00
aec545821e added fr (Add cells) 2022-11-30 19:44:09 +03:00
0442ef987d edited fr 2022-11-30 19:42:53 +03:00
36894702cf Update Redmine article 2022-11-30 18:41:52 +03:00
c27f8b94a9 edited fr 2022-11-30 10:58:26 +03:00
71c67cb2ee edited fr 2022-11-29 19:47:07 +03:00
f19741c5b9 edited fr 2022-11-28 17:30:02 +03:00
2fccba9817 edited fr 2022-11-28 17:26:26 +03:00
2a3b1501fb edited fr 2022-11-25 17:57:59 +03:00
41c9d96140 edited fr 2022-11-24 18:36:51 +03:00
e793f3a59f edited fr 2022-11-24 16:29:03 +03:00
09bfb8ca14 edited About fr 2022-11-23 18:38:29 +03:00
1b688cdbd0 Fix #41 2022-11-23 16:23:53 +03:00
d23172252f Rename control 2022-11-23 15:55:48 +03:00
abb963cd46 Add new article, new section and fixes for Docs Cloud 2022-11-23 15:44:04 +03:00
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
b5172abb11 Update Jira article 2022-11-17 17:54:13 +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