Commit Graph

90 Commits

Author SHA1 Message Date
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
eb972c9482 Add Redmine to BaseHeader.fr.ascx and HelpCenter.fr.ascx 2021-11-25 13:45:04 +03:00
SvetlanaLisina
5526849ebf Фикс прекомпиляции хелпцентра
# Conflicts:
#	Web/Controls/Help/GettingStarted/Integration/Jira/GettingStartedJira.ascx
#	Web/Controls/Help/GettingStarted/Integration/Mattermost/GettingStartedMattermost.ascx
#	Web/Integration/gettingstarted-mattermost.aspx
#	Web/Integration/gettingstarted-redmine.aspx
2021-11-24 19:02:19 +03:00
9321d8562d фикс прекомпиляции хелпцентра 2021-11-24 18:51:05 +03:00
3c569d0e5e Merge branch 'feature/redmine' into release/1.2.0 2021-11-24 18:48:25 +03:00
5feb8f514d Add redmine article 2021-11-10 18:29:20 +03:00
e79a43eb96 Add moodle article 2021-10-26 18:00:23 +03:00
685d98297c Add translations (fr) - Chamilo, Confluence, Nuxeo, Liferay; remove 'outofdate' for integration pages 2021-10-22 10:45:38 +03:00
87494b430d Merge branch 'feature/mob_projects_android' into release/1.0.0 2021-10-07 19:02:25 +03:00
6fff7362b6 Update Confluence, Liferay, Nuxeo articles; Add Chamilo article; Add Nuxeo video 2021-09-20 14:58:20 +03:00
1a8945b51e Add new article: onlyoffice-jira connector 2021-09-20 12:32:00 +03:00
3c96613965 Mobile side menus translated into German + minor fixes (typos, etc.) here and there. 2021-07-27 14:40:07 +03:00
b6dfb6e86d Added new masters, index page, side menu, add new pages to lists 2021-07-20 13:16:36 +03:00
edd080477f Ver.4: Fixes for headers, buttons, articles. 2021-06-09 17:30:46 +03:00
SvetlanaLisina
f9d8d1876c changed mobile button on header and footer, fixed closed-button, fixed popup 2021-05-11 17:48:05 +03:00
1f9b75037a Merge branch 'feature/articles_howto'
# Conflicts:
#	Web/Controls/Common/BaseHeader/BaseHeader.ru.ascx
2021-03-18 13:03:30 +03:00
dac2fda541 Updated links in BaseHeader.ascx (document editors) 2021-03-10 15:10:55 +03:00
5d86a39542 Deleted show content toggles from Administration module (ru), header fix 2021-02-19 17:32:57 +03:00
632721a25a Added translations for Footer, Header, MainPage (ru) 2021-02-12 18:43:05 +03:00
SvetlanaLisina
ede3c7780d bugfix 2020-12-28 18:17:26 +03:00
SvetlanaLisina
2dbf734dea added translate language-selector 2020-12-08 18:23:36 +03:00
SvetlanaLisina
c0986d041b changed style, bugfix and added language-selector on footer 2020-12-08 18:23:12 +03:00
c866420565 Renamed ONLYOFFICE Workspace Control Panel into ONLYOFFICE Control Panel, removed "ONLYOFFICE Workspace" from tags for Control Panel articles 2020-12-02 11:36:22 +03:00
7116c00174 Fixed uniformity of menu items 2020-11-10 17:58:25 +03:00
SvetlanaLisina
3a8a2edb7e Fixed links in Integration Guides 2020-11-03 18:01:58 +03:00
d99681ea3b Added Control Panel menu item into Administration section 2020-11-02 18:09:36 +03:00
8a519662e1 Fixed Development menu item 2020-11-02 17:06:31 +03:00
f39e3be4fc Added navigation links for Administration section, changed Cloud and Desktop links 2020-11-02 15:50:14 +03:00