Commit Graph

117 Commits

Author SHA1 Message Date
76c262f405 Edit menu in languages 2023-12-04 11:37:45 +03:00
trovier
f186d5cb99 Initial commit (EN)
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
#	Web/Controls/Help/HelpCenter.ascx
#	Web/Controls/Help/SideMenu/Integration/IntegrationMenu.ascx
2023-12-04 11:23:56 +03:00
de7cf43b0c Edit menu for new connectors in languages 2023-11-23 12:19:11 +03:00
trovier
fd35492c6c Initial commit (EN) 2023-11-08 12:08:37 +01:00
trovier
e7c9a5cf24 Initial commit (EN) 2023-10-26 19:59:39 +02:00
94e1d45047 Merge branch 'feature/build7.5' into release/1.17.0 2023-10-17 11:00:30 +03:00
627ab0216c Edit header and main page for es, fr, it 2023-10-16 14:12:59 +03:00
trovier
b61beb2b5d German translation 2023-10-16 01:12:22 +02:00
7e26d61a37 Edit translations, update screens for PDF Editor (ru) 2023-10-05 14:26:35 +03:00
trovier
3603636ac7 Basics finished: articles, controls, indexes, pictures 2023-09-25 17:33:15 +02:00
4d5313d2b5 Merge remote-tracking branch 'remotes/origin/feature/odoo_new' into release/1.15.0 2023-09-25 12:11:22 +03:00
121d585367 Add translation (fr) for odoo 2023-08-17 17:57:04 +03:00
0f2bba30c4 Fixed menu and controls 2023-07-28 12:36:20 +03:00
2f84d0300b Merge branch 'feature/build_7.4' into release/1.14.0 2023-07-20 14:08:28 +03:00
b94607fc5f Merge branch 'feature/docspace-install' into release/1.14.0
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2023-07-18 14:24:44 +03:00
5f83a14e29 Edit side menu, header (fr) 2023-07-10 16:45:16 +03:00
26ec6c0bc4 Start adding DocSpace installation articles 2023-06-01 15:48:11 +03:00
trovier
9d413b15d5 Initial commit 2023-05-16 16:27:32 +02:00
65fe90bf66 Edit menu 2023-04-21 17:45:02 +03:00
5f94f31004 Merge branch 'feature/docspace' into release/1.12.0
# Conflicts:
#	Web/Controls/Common/BaseHeader/BaseHeader.fr.ascx
#	Web/Controls/Help/GettingStarted/Configuration/Configuration.ascx
#	Web/css/help.less
2023-04-21 17:05:07 +03:00
800de6074c Add translations (fr) 2023-04-20 13:59:49 +03:00
trovier
857c41c144 German translation added. 2023-04-06 17:10:49 +02:00
trovier
8304c490bb Header changes, CSS changes, Help/HelpCenter.ascx changes (all languages). 2023-03-16 16:05:07 +01:00
5f92087db8 Move missing files and changes from old Mattermost branch 2023-02-21 16:14:20 +03:00
17989db513 Add DocSpace pages to menu 2023-02-09 18:15:02 +03:00
76153ed269 Add translations for header (FR) 2023-02-01 16:53:53 +03:00
abb963cd46 Add new article, new section and fixes for Docs Cloud 2022-11-23 15:44:04 +03:00
c3134a9e41 Fixes for SharePoint, WordPress. The problem with Wordpress.de.ascx remains. 2022-08-23 16:43:33 +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
f230a4670c Merge branch 'feature/contribution_rework' into release/1.6.0 2022-07-28 15:05:44 +03:00
8bd87f869e Add translations for Android Projects (fr) 2022-07-15 11:57:15 +03:00
c1873a4cdd English is complete. 2022-07-01 16:19:52 +03:00
4d0fd20a49 Header menu reworked (EN+DE). 2022-07-01 13:54:32 +03:00
654426af32 Continue updating sitemaps 2022-06-10 18:31:32 +03:00
869bfe603e Continue editing sitemaps and structure fixes 2022-06-08 18:35:08 +03:00
50d3a3f899 Merge branch 'feature/new_alfresco_wordpress' into release/1.5.0
# Conflicts:
#	Web/Controls/Common/BaseHeader/BaseHeader.ascx
#	Web/Controls/Help/GettingStarted/Integration/Alfresco/AlfrescoGettingStarted.ascx
#	Web/Controls/Help/GettingStarted/Integration/Alfresco/AlfrescoGettingStarted.de.ascx
#	Web/Controls/Help/Integration/Integration.ascx
#	Web/Controls/Help/SideMenu/Integration/IntegrationMenu.ascx
#	Web/Controls/Help/Video/Video.ascx
#	Web/css/help.less
2022-05-31 13:48:44 +03:00
b2cfc6aaaf New article for WordPress connector (EN only). 2022-05-12 15:06:49 +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
6ea751c6d1 Added Strapi to header and main page in all languages. 2022-04-26 15:04:39 +03:00
b6d215af76 Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release
# Conflicts:
#	Web/Controls/Help/Administration/Administration.de.ascx
#	Web/Controls/Help/Administration/ControlPanel.de.ascx
2022-04-21 09:14:00 +03:00
d691ecc6d8 Feed tool: main page, header + German. AuthorizationKeys.de.ascx fixes. ControlPanel.de.ascx fixes. 2022-04-20 17:40:51 +03:00
1bd72dbc15 Merge branch 'feature/strapi_connector' into feature/test-merge-for-release 2022-04-13 09:29:40 +03:00
f39f2f1c17 Initial commit. 2022-04-11 16:27:43 +03:00
28b4ccdcf7 Merge branch 'feature/moodle' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/HelpCenter.ascx
#	Web/Controls/Help/Integration/Integration.ascx
#	Web/Controls/Help/Video/Video.ascx
#	Web/css/help.less
2022-04-05 15:33:55 +03:00
dfb9965ae6 Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/Tags/collaborative-editing/collaborative-editing.ascx
2022-03-17 16:04:18 +03:00
9806e697fa Rename controls 2022-02-15 17:04:43 +03:00
dc9a9bfd94 Add ONLYOFFICE Personal section 2022-02-01 13:52:38 +03:00
ef0906ae90 Fixes in translations and menus 2022-01-17 13:03:09 +03:00
c973db4c36 Add links in languages, fixes 2021-12-02 12:09:53 +03:00
7c98469ca1 Merge branch 'feature/jira' into hotfix/1.2.1
# Conflicts:
#	Web/Controls/Help/GettingStarted/Integration/Jira/GettingStartedJira.ascx
#	Web/Controls/Help/Tags/collaborative-editing/collaborative-editing.ascx
#	Web/Controls/Help/Tags/docker-version/docker-version.ascx
#	Web/Controls/Help/Tags/document-server/document-server.ascx
#	Web/Controls/Help/Tags/install-onlyoffice/install-onlyoffice.ascx
#	Web/Controls/Help/Tags/linux-version/linux-version.ascx
#	Web/Controls/Help/Tags/local-server/local-server.ascx
#	Web/Controls/Help/Tags/open-source-version/open-source-version.ascx
#	Web/css/help.less
2021-12-02 11:50:57 +03:00