svetlana maleeva 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
..
HelpfulHints	Merge branch 'feature/helpcenter_12.0-for-release' into release/1.4.0	2022-05-09 17:02:25 +03:00
images	Merge branch 'feature/helpcenter_12.0-for-release' into release/1.4.0	2022-05-09 17:02:25 +03:00
ProgramInterface	DE fixes in German	2022-03-24 18:19:40 +03:00
search	Update indexes.js - en, de, fr, ru	2022-05-09 14:02:42 +03:00
UsageInstructions	Fix PdfViewer.htm	2022-05-07 11:37:58 +03:00
callback.js	Add OfficeWeb from production site.	2019-12-10 17:18:55 +03:00
Contents.json	Add aspx pages and menu for new htm pages	2022-04-12 14:49:46 +03:00
editor.css	Changed fonts order (bug 47092)	2021-05-18 17:40:54 +03:00