Commit Graph

4711 Commits

Author SHA1 Message Date
8ff9bb1318 Merge branch 'feature/build7.5' into release/1.17.0
# Conflicts:
#	Web/App_GlobalResources/Resource.fr.resx
2023-10-17 13:35:19 +03:00
8d891cdc63 Minor fixes 2023-10-17 13:24:23 +03:00
040ab3881f Update DSChangelog.ascx, DEChangelog.ascx for v7.5, update program versions 2023-10-17 12:26:07 +03:00
cbe6f59cb1 Update Changelog.md 2023-10-17 12:17:28 +03:00
772c809e31 Merge branch 'feature/structure-fixes' into release/1.17.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/App_GlobalResources/Resource.ru.resx
2023-10-17 11:14:21 +03:00
fc8ffed56e Fixes for address.htm (es, it) 2023-10-17 11:08:36 +03:00
0974eb0f21 For bur 63045 2023-10-17 11:07:58 +03:00
7da3b35973 Merge branch 'feature/shortcuts' into release/1.17.0
# Conflicts:
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/images/keytips1.png
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/images/keytips2.png
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/ru/images/keytips1.png
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/ru/images/keytips2.png
2023-10-17 11:02:09 +03:00
94e1d45047 Merge branch 'feature/build7.5' into release/1.17.0 2023-10-17 11:00:30 +03:00
b2ba874e17 Edit contents.json (fr) and SideMenu 2023-10-17 10:45:18 +03:00
5fd0d7de3b Update indexes.js 2023-10-17 10:32:01 +03:00
c9c98bb28c Minor fix and typos 2023-10-17 04:08:53 +03:00
89e536a77b Add Ru translation for PE 7.5 2023-10-17 03:59:55 +03:00
cc228b319c Add Ru translation for SE 7.5 2023-10-17 03:59:18 +03:00
afecb871d8 Add Ru translation for DE 7.5 2023-10-17 03:58:38 +03:00
d7c2540527 Update screen (fr) 2023-10-16 18:50:25 +03:00
2b19e0e67d Add translations for pdf editor (fr) 2023-10-16 18:40:52 +03:00
3e19e515ae Fix insert-chart.ascx tag 2023-10-16 17:42:36 +03:00
b107b60371 Edit several tags 2023-10-16 17:36:51 +03:00
627ab0216c Edit header and main page for es, fr, it 2023-10-16 14:12:59 +03:00
698c6f35a9 Update indexes.js 2023-10-16 13:58:42 +03:00
trovier
d237de6f92 Minor fix for side menu 2023-10-16 12:51:00 +02:00
b21b31974c Fix expanded menu (restore missing lines in help.less) 2023-10-16 13:32:15 +03:00
trovier
c0ac39fbc6 Minor css fix 2023-10-16 12:17:07 +02:00
59bec2eb4f Update Changelog.md 2023-10-16 12:33:12 +03:00
81dcf6ec42 Merge branch 'feature/encryption' into release/1.17.0 2023-10-16 12:21:25 +03:00
d2539f6fb1 Merge branch 'feature/bug_64021_recaptcha' into release/1.17.0 2023-10-16 12:21:08 +03:00
a484ab5988 Merge branch 'feature/bug_59410_https' into release/1.17.0 2023-10-16 12:20:55 +03:00
trovier
dd531a92b8 Merge remote-tracking branch 'remotes/origin/feature/pdfeditor_new' into feature/build7.5
# Conflicts:
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/images/icons.png
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/images/sprite.css
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/images/icons.png
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/images/sprite.css
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/images/icons.png
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/images/sprite.css
#	Web/css/help.less
2023-10-16 10:26:51 +02:00
5bf5b2b195 Fix RU according to EN 2023-10-16 10:39:11 +03:00
trovier
215bae3ede Minor fixes for EN 2023-10-16 01:12:53 +02:00
trovier
b61beb2b5d German translation 2023-10-16 01:12:22 +02:00
trovier
0e0361a352 Fixes as per testing (EN) 2023-10-15 21:24:54 +02:00
trovier
63f405f542 Fixes for css (new icon for PDF, changed editcomment icon for all editors) 2023-10-15 21:24:03 +02:00
fc9d81c75e Edit document-structure.ascx and line-breaks.ascx tags 2023-10-15 21:44:25 +03:00
d41c45a3c4 Fix translations (ru) 2023-10-15 14:25:14 +03:00
c1a61c0c81 Add translations (fr) 2023-10-13 18:32:00 +03:00
trovier
0831220987 Minor fix (EN) 2023-10-13 16:47:05 +02:00
trovier
98150ff334 Fixes as per testing (EN and DE) 2023-10-13 16:43:15 +02:00
trovier
e644d4fb4c Fixes for EN 2023-10-13 16:23:16 +02:00
trovier
a28210ecd9 German translation 2023-10-13 16:22:52 +02:00
4a6124b46f Edit several pages 2023-10-13 17:12:18 +03:00
3d347433a4 Fix tag 2023-10-13 13:41:55 +03:00
57c879b4a9 Fix 2fa description 2023-10-13 12:15:47 +03:00
ee1efb79c7 Fix shortcuts 2023-10-13 11:36:23 +03:00
6d38294b2e Structure fixes for /mobile-applications/documents/document-editor/page-formatting/set-page-parameters.aspx
Partial fix for /ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/InsertFunction.aspx
2023-10-13 11:22:52 +03:00
625c8eb079 Fix shortcuts 2023-10-12 15:34:37 +03:00
301b52596a Fix shortcuts 2023-10-12 12:01:47 +03:00
9a11ed8cf2 Fix shortcuts 2023-10-11 18:23:07 +03:00
trovier
87c29c4c20 Roadmap updated as per testing 2023-10-11 16:56:29 +02:00