Commit Graph

257 Commits

Author SHA1 Message Date
trovier
616ee27cb9 PE: new icon. 2022-10-05 14:25:50 +03:00
91d5c8c4bc Merge remote-tracking branch 'remotes/origin/feature/new-languages-docs7.2' into release/1.7.0 2022-09-26 17:53:28 +03:00
e7dcc196c5 Build 7.2: Fixes as per testing. 2022-09-26 14:29:51 +03:00
0ccf69d172 Build 7.2: fixes as per testing; full German translation. 2022-09-23 17:00:13 +03:00
5d2348578a Fix icon styles for presentation and spreadsheet editors 2022-09-22 14:54:08 +03:00
e8ebbdb845 Build 7.2: Fixes as per testing. 2022-09-20 18:12:28 +03:00
31aed7071c Build 7.2: Fixes as per testing. 2022-09-09 18:18:19 +03:00
2eeee22a89 Build 7.2: Fixes as per testing (EN only). 2022-09-07 17:09:11 +03:00
f7df0ceb85 Build 7.2: Fixes as per testing. 2022-09-06 16:46:11 +03:00
3fe330ae00 Fixes for help.less 2022-09-06 13:03:26 +03:00
f258d015a5 Fixed help.less 2022-09-05 19:34:30 +03:00
9a00fb0654 Copied styles to help.less 2022-09-05 19:00:10 +03:00
7019439900 Merge branch 'develop' into feature/web-apps-help
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/App_GlobalResources/Resource.ru.resx
#	Web/Controls/Help/Tags/change-color/change-color.es.ascx
#	Web/Controls/Help/Tags/create-event/create-event.de.ascx
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/UsageInstructions/MergeCells.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/MergeCells.htm
2022-08-12 15:03:45 +03:00
96721b1cb4 Edit left menu for contribution pages 2022-08-10 16:37:39 +03:00
66f4669d27 Add new languages for Docs 7.2 - Basque, Malay, Portuguese (Portugal), Chinese (Traditional, Taiwan), Armenian - for docs-available-languages.aspx 2022-08-04 17:17:12 +03:00
4bdfb783e1 Copied styles from sprite.css to help.less 2022-08-04 15:38:12 +03:00
5f537bfe5e Merge branch 'feature/fix-merge-cells' into feature/web-apps-help
# Conflicts:
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/UsageInstructions/MergeCells.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/MergeCells.htm
2022-08-02 10:58:59 +03:00
d38c0b6b17 Merge branch 'feature/fix-logo' into release/1.6.0 2022-07-19 17:44:34 +03:00
3d44f05afd Merge branch 'feature/web-apps-help' into release/1.6.0
# Conflicts:
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/it/HelpfulHints/SupportedFormats.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/it/HelpfulHints/SupportedFormats.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/ru/HelpfulHints/SupportedFormats.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/it/HelpfulHints/SupportedFormats.htm
2022-07-19 16:34:01 +03:00
ab0ee4e6ca Try to change header height - 72px 2022-07-18 17:16:23 +03:00
50265a7026 Merge branch 'feature/supported-formats-icons' into release/1.6.0 2022-07-14 12:10:30 +03:00
ab46b03485 Replace round markers with svg image 2022-07-11 10:31:28 +03:00
e880e8cd35 Merge branch 'feature/search-icon' into develop 2022-07-05 10:48:48 +03:00
eaf0081bb1 Try to fix displaying images for pages: Program Interface, Insert Images 2022-06-22 10:55:53 +03:00
2037e03bf9 Fix search icon position in Firefox 2022-06-06 14:36:18 +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
14cd1b356b Fixes for WordPress as per testing + added video. 2022-05-18 16:33:38 +03:00
b2cfc6aaaf New article for WordPress connector (EN only). 2022-05-12 15:06:49 +03:00
30be225226 Replace CSS code with images for buttons 2022-05-11 21:02:41 +03:00
4048a074a2 Fix style for buttons 2022-05-11 16:50:36 +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
ce20ce46e9 Try to fix markers for .documenteditorpages 2022-05-08 12:54:17 +03:00
1dc034de40 Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release
# Conflicts:
#	Web/Controls/Help/Administration/Administration.ascx
#	Web/Controls/Help/Administration/ControlPanel.ascx
#	Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.ascx
#	Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.de.ascx
#	Web/Controls/Help/ArticlesCompleteList/Guides/151_share_text/151_share_text.ascx
#	Web/Controls/Help/ArticlesCompleteList/ONLYOFFICEEditors/2021_using-chat.ascx
#	Web/Controls/Help/ArticlesCompleteList/TipsTricks/130_folder_permissions/130_folder_permissions.ascx
#	Web/Controls/Help/Desktop/Documents/Common/PrivateRoom/PrivateRoom.de.ascx
#	Web/Controls/Help/GettingStarted/Projects/GettingStartedProjects.de.ascx
#	Web/Controls/Help/Guides/Documents/ShareDocuments/ShareDocuments.ascx
#	Web/Controls/Help/ONLYOFFICEEditors/EditorsUserGuides/EditorsUserGuides.ascx
#	Web/Controls/Help/Tags/generate-report/generate-report.ascx
#	Web/Controls/Help/Tags/generate-report/generate-report.de.ascx
#	Web/Controls/Help/Tags/manage-access-rights/manage-access-rights.ascx
#	Web/Controls/Help/Tags/onlyoffice-people/onlyoffice-people.ascx
#	Web/Controls/Help/Tags/onlyoffice-people/onlyoffice-people.de.ascx
#	Web/Controls/Help/Tags/onlyoffice-projects/onlyoffice-projects.ascx
#	Web/Controls/Help/Tags/onlyoffice-projects/onlyoffice-projects.de.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.de.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.es.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.fr.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.it.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.ru.ascx
#	Web/Controls/Help/Tags/report-templates/report-templates.ascx
#	Web/Controls/Help/Tags/report-templates/report-templates.de.ascx
#	Web/Controls/Help/Tags/security/security.ascx
#	Web/Controls/Help/Tags/security/security.de.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.de.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.es.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.fr.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.it.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.ru.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.de.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.fr.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/Groups.ascx
#	Web/Controls/Help/UserGuides/Groups.de.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.ascx
#	Web/Controls/Help/UserGuides/GroupsMail.de.ascx
#	Web/Controls/Help/UserGuides/GroupsProjects.ascx
#	Web/Controls/Help/UserGuides/GroupsProjects.de.ascx
#	Web/Controls/Help/UserGuides/UserGuides.ascx
#	Web/ONLYOFFICE-Editors/Editors-User-Guides/DocumentEditor/Add-watermark.aspx
#	Web/ONLYOFFICE-Editors/Editors-User-Guides/SpreadsheetEditor/Merge-and-unmerge-cells.aspx
#	Web/ONLYOFFICE-Editors/Editors-User-Guides/SpreadsheetEditor/Merge-cells.aspx
2022-04-20 16:11:30 +03:00
1900fd44cf Structure fix for new Strapi article 2022-04-13 10:02:54 +03:00
fc9e289ae6 German for a part of new fixes + intermediate (!) for GettingStartedDocuments.de.ascx 2022-04-11 14:34:36 +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
53aab228eb Merge remote-tracking branch 'remotes/origin/develop' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/Tags/collaborative-editing/collaborative-editing.ascx
#	Web/Controls/Help/Tags/document-server/document-server.ascx
#	Web/Controls/Help/Tags/open-source-version/open-source-version.ascx
2022-04-05 14:09:39 +03:00
c59a07fb60 Add Integrate Moodle video 2022-03-28 17:18:49 +03:00
5d45e84491 Add Jira video, update video thumbnails 2022-03-24 18:27:51 +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
ac97b28cf3 Merge branch 'feature/test-3-branches-further-changes' into feature/test-merge-for-release 2022-03-17 13:10:38 +03:00
9a0398cf43 Add videos: Integrate Redmine, Fillable forms 2022-02-25 19:25:59 +03:00
b4c75d9d29 Merge remote-tracking branch 'remotes/origin/feature/install-groups' into feature/test-prerelease-1.4.0 2022-02-11 14:47:51 +03:00
492e767669 Add Nuxeo plugin video 2022-02-10 17:58:25 +03:00
ddd288d92d Add 5 new videos, update tags; minor fixes 2022-02-08 14:42:14 +03:00
dc9a9bfd94 Add ONLYOFFICE Personal section 2022-02-01 13:52:38 +03:00
da579a9d19 Update Install Groups on Ubuntu (mysql, certbot) 2022-01-25 11:32:52 +03:00
d75d05302c Add new languages for desktop editors and Docs 2022-01-13 15:35:19 +03:00
f6ede290ff Merge branch 'develop' into feature/docs-7.0 2021-12-17 16:56:20 +03:00
7da6435475 Change color for shortcut_toggle.disabled 2021-12-17 16:34:12 +03:00