|
|
8d891cdc63
|
Minor fixes
|
2023-10-17 13:24:23 +03:00 |
|
|
|
6c44bcb6f6
|
Merge branch 'feature/linode' into release/1.14.0
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.fr.resx
# Web/Controls/Help/Tags/document-server/document-server.ascx
|
2023-07-27 13:45:58 +03:00 |
|
|
|
2f84d0300b
|
Merge branch 'feature/build_7.4' into release/1.14.0
|
2023-07-20 14:08:28 +03:00 |
|
|
|
ed2734d2f8
|
Fix menu (fr)
|
2023-07-13 11:34:17 +03:00 |
|
|
|
44ab37c0eb
|
Edit Resource.fr.resx
|
2023-07-12 16:48:19 +03:00 |
|
|
|
87c667a115
|
Edit Resource.fr.resx
|
2023-07-10 17:10:13 +03:00 |
|
|
|
7c73673533
|
Merge branch 'feature/structure' into release/1.13.0
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.fr.resx
# Web/App_GlobalResources/Resource.resx
# Web/App_GlobalResources/Resource.ru.resx
|
2023-06-09 18:35:46 +03:00 |
|
|
|
a080447597
|
Edit math-trigonometry-functions.ascx tag
|
2023-05-02 18:51:02 +03:00 |
|
|
|
1649678fb3
|
Add translation, edit controls
|
2023-04-26 13:04:27 +03:00 |
|
|
|
e022f014d0
|
Merge branch 'feature/structure-fix' into release/1.12.0
# Conflicts:
# Web/App_GlobalResources/Resource.fr.resx
|
2023-04-21 16:19:33 +03:00 |
|
|
|
818ebd948d
|
Merge branch 'feature/translations-fr' into release/1.12.0
# Conflicts:
# Web/App_GlobalResources/Resource.fr.resx
|
2023-04-21 16:17:01 +03:00 |
|
|
|
d2db11f171
|
Edit financial-functions.ascx tag
|
2023-04-21 15:59:54 +03:00 |
|
|
|
22c4c39419
|
Edit engineering-functions.ascx tag
|
2023-04-11 18:40:37 +03:00 |
|
|
|
0e53b85f9d
|
Remove outdated controls, edit 3 tags
|
2023-04-10 17:10:41 +03:00 |
|
|
|
024c7e344d
|
Add translations for the Personal section (fr)
|
2023-03-31 16:06:18 +03:00 |
|
|
|
043689366c
|
Merge branch 'feature/workspace-12.5' into release/1.11.0
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.es.resx
# Web/App_GlobalResources/Resource.fr.resx
# Web/App_GlobalResources/Resource.resx
# Web/App_GlobalResources/Resource.ru.resx
# Web/Controls/Help/ABCIndex/ABCCompleteArticleList.ascx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/CommunicationPlugins.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/HTML.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/HighlightedCode.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertReferences.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Jitsi.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/PhotoEditor.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Speech.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Thesaurus.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Translator.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Typograf.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/WordCounter.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/CommunicationPlugins.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/HighlightedCode.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/PhotoEditor.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/Thesaurus.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/Translator.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/CommunicationPlugins.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/HighlightedCode.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/PhotoEditor.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/Thesaurus.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/Translator.aspx
|
2023-03-24 16:21:30 +03:00 |
|
|
|
3cf2880f0c
|
Edit tag
|
2023-03-23 17:35:14 +03:00 |
|
|
|
37d55c3a87
|
Edit several tags
|
2023-03-22 16:12:03 +03:00 |
|
|
|
27882a05c8
|
Add translation (fr)
|
2023-03-17 16:34:21 +03:00 |
|
|
|
44a4b5b42e
|
Edit two tags
|
2023-03-17 16:21:21 +03:00 |
|
|
|
d153102a14
|
Edit controls in articles complete list, edit several tags
|
2023-03-15 17:30:01 +03:00 |
|
|
|
2e85a9408e
|
Continue fixes in ArticlesCompleteList
|
2023-03-10 14:13:11 +03:00 |
|
|
|
ca6ab5d94a
|
Partial structure fixes in ArticlesCompleteList
|
2023-03-09 14:40:17 +03:00 |
|
|
|
f21c5195ea
|
Update translations (fr)
|
2023-03-06 13:58:50 +03:00 |
|
|
|
7702ab867d
|
Add translations (fr)
|
2023-02-27 11:24:00 +03:00 |
|
|
|
a3986844bd
|
Edit controls in ArticlesCompleteList and .resx files for Installation -> Desktop section
|
2023-02-13 12:53:58 +03:00 |
|
|
|
0e0478e708
|
Add translations for Mail articles (FR)
|
2023-02-07 17:40:19 +03:00 |
|
|
|
76153ed269
|
Add translations for header (FR)
|
2023-02-01 16:53:53 +03:00 |
|
|
|
5e29000974
|
Merge branch 'feature/administration-fr' into release/1.9.0
# Conflicts:
# Web/App_GlobalResources/Resource.fr.resx
|
2023-01-31 11:44:44 +03:00 |
|
|
|
1899f5c892
|
Merge branch 'feature/structure' into release/1.9.0
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.es.resx
# Web/App_GlobalResources/Resource.fr.resx
# Web/App_GlobalResources/Resource.resx
# Web/App_GlobalResources/Resource.ru.resx
|
2023-01-31 11:37:55 +03:00 |
|
|
|
a6859bed51
|
Edit tags: text-data-functions.ascx, using-functions.ascx, using-named-ranges.ascx; edit several aspx pages
|
2023-01-30 15:31:27 +03:00 |
|
|
|
ccca1e560a
|
Partial fixes for text-data-functions.ascx tag
|
2023-01-26 18:24:19 +03:00 |
|
|
|
d73a91ae18
|
Edit lookup-reference-functions.ascx tag, start editing text-data-functions.ascx tag
|
2023-01-26 14:09:07 +03:00 |
|
|
|
250abfaf45
|
Add translations (Administration, FR)
|
2023-01-16 12:01:38 +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 |
|
|
|
d205f57d13
|
Add DocsCloudRegistration.fr.ascx
|
2022-12-08 10:54:17 +03:00 |
|
|
|
f19741c5b9
|
edited fr
|
2022-11-28 17:30:02 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
28b50e4f3d
|
edit fr
|
2022-09-21 19:14:18 +03:00 |
|
