Commit Graph

681 Commits

Author SHA1 Message Date
32f1d0849e Merge branch 'feature/fix-merge-cells' into release/1.6.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
#	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 16:12:29 +03:00
cfbf4529b1 Merge branch 'feature/web-apps-help-german' into release/1.6.0 2022-08-02 14:27:19 +03:00
f5102f0e4c Edit formatting for MergeCells.htm 2022-08-01 18:48:31 +03:00
4e1017b29a Fix image paths again 2022-08-01 17:13:49 +03:00
f785648576 Fix MergeCells.htm - en, de (remove classes used for .ascx, replace image paths) 2022-08-01 16:35:20 +03:00
96371109c3 Minor fix for images display in PE: Create Lists. 2022-07-29 13:32:20 +03:00
e4adf67c70 Fixes for images and articles. 2022-07-28 18:28:29 +03:00
3cd32e96c5 Merge branch 'feature/web-apps-help-fr' into release/1.6.0 2022-07-28 16:52:25 +03:00
39000d005b Merge branch 'feature/new_german' into release/1.6.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
2022-07-28 15:05:02 +03:00
2919f512b8 Fixes for images in Document Editor, German. 2022-07-27 14:48:48 +03:00
2fcbfca213 Update translations (FR) - Collaboration section 2022-07-26 13:42:44 +03:00
8d2896636b Spreadsheet Editor, UsageInstructions: translation and images updated. 2022-07-22 18:04:57 +03:00
19bdadd300 Spreadsheet Editor, ProgramInterface: translation and images update. 2022-07-21 18:06:41 +03:00
68a9cb90aa Spreadsheet Editor, HelpfulHints: translation and images update. 2022-07-21 18:00:11 +03:00
50f807c69e Presentation Editor, HelpfulHints: translation and images update. 2022-07-21 17:48:26 +03:00
8032bce34b Presentation Editor, ProgramInterface: translation and images update. 2022-07-21 17:28:28 +03:00
2ad9cc0291 Presentation Editor, UsageInstructions: translation and images update. 2022-07-21 17:24:21 +03:00
76e205b53e Document Editor, HelpfulHints: translation and images update. 2022-07-21 15:49:21 +03:00
810bb1d13b Document Editor, ProgramInterface: translation and images update. 2022-07-21 15:10:29 +03:00
048537679c Document Editor, UsageInstructions: translation and images update. 2022-07-21 15:04:50 +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
a47cde1e35 Merge branch 'feature/supported-formats' into release/1.6.0 2022-07-14 12:09:56 +03:00
650f415d1e Add translations for SupportedFormats.htm - fr, es 2022-07-13 18:18:14 +03:00
a09fe6e04b Some more fixes for Document Editor pages 2022-07-04 14:02:49 +03:00
2751d38a19 German translation. 2022-07-01 15:07:14 +03:00
0459760cbb Finish editing Presentation Editor pages 2022-07-01 14:53:25 +03:00
a779681d7f Continue editing Presentation Editor pages 2022-06-29 18:26:01 +03:00
c552c294b9 Start editing Presentation Editor pages 2022-06-28 18:40:07 +03:00
65d279d8c6 Finish editing Spreadsheet Editor pages 2022-06-28 17:39:39 +03:00
ed858d012e Start editing pages for Spreadsheet Editor 2022-06-27 18:41:08 +03:00
6943bb9117 Finish editing pages for Document Editor 2022-06-27 16:31:37 +03:00
4e85e9bf29 Change SupportedFormats.htm in all languages according to EN 2022-06-27 11:04:46 +03:00
f071339d55 Add a link to api site 2022-06-24 18:57:41 +03:00
b30405a09d Continue replacing div tags 2022-06-24 18:32:36 +03:00
1c943e4e87 Fix for DjVu, XPS 2022-06-24 10:33:37 +03:00
2060b76925 Start replacing <div> with <span> within <p></p> 2022-06-23 18:29:49 +03:00
7dd6f96552 Fix uppercase letters in Viewer.htm (en, fr) 2022-06-23 13:42:11 +03:00
e905a98cff Fixes for SupportedFormats.htm 2022-06-23 10:54:38 +03:00
a7975b360d Try to rework Download section 2022-06-22 16:38:50 +03:00
e80710fe36 Edit supported formats (view after conversion, order, etc.) 2022-06-22 15:19:40 +03:00
703798b1c6 Remove download.html 2022-06-21 14:38:27 +03:00
85a53f2c4c Fix InsertDropCap.htm file name 2022-06-21 13:48:32 +03:00
4960189a5d Replace 'apps' folder with the new one from 'web-apps' repository 2022-06-21 13:12:39 +03:00
1db74d5562 Add missing image 2022-05-27 17:24:08 +03:00
8a689a58d6 Update Contents.json 2022-05-27 15:51:16 +03:00
f00aed2dc6 Translation for Mattermost and Jitsi. 2022-05-27 15:43:16 +03:00
46bf7caecb Merge remote-tracking branch 'remotes/origin/feature/drawio' into develop
# Conflicts:
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/Contents.json
2022-05-27 15:37:12 +03:00
a9c3fd8d77 Projects - updated screenshots. 2022-05-27 15:00:17 +03:00
b0e56ce213 Fix KeyboardShortcuts.htm - DE, PE, SSE 2022-05-26 16:59:29 +03:00
4fda1496f1 Update screenshot of Drawio 2022-05-25 16:13:09 +03:00