Commit Graph

693 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
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
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
afecb871d8 Add Ru translation for DE 7.5 2023-10-17 03:58:38 +03:00
698c6f35a9 Update indexes.js 2023-10-16 13:58:42 +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
trovier
b61beb2b5d German translation 2023-10-16 01:12:22 +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
c1a61c0c81 Add translations (fr) 2023-10-13 18:32:00 +03:00
trovier
98150ff334 Fixes as per testing (EN and DE) 2023-10-13 16:43:15 +02:00
trovier
a28210ecd9 German translation 2023-10-13 16:22:52 +02:00
625c8eb079 Fix shortcuts 2023-10-12 15:34:37 +03:00
301b52596a Fix shortcuts 2023-10-12 12:01:47 +03:00
ea1caf2d99 Fix shortcuts 2023-10-11 14:05:44 +03:00
trovier
f7732e9ff3 New fixes: Review.htm (EN) 2023-10-10 16:51:09 +02:00
trovier
3b3f46d3cc Fixes for EN 2023-10-09 15:52:52 +02:00
e35c15f0c8 Fix shortcuts 2023-10-06 11:40:10 +03:00
17a6d462e2 Edit shortcuts 2023-10-05 16:57:07 +03:00
trovier
5e1bec2e20 German translation updated (all editors) 2023-10-03 15:10:06 +02:00
trovier
312194f2ac Minor fixes (EN) 2023-10-03 15:09:27 +02:00
7baee609b6 Fix shortcuts 2023-09-27 14:21:26 +03:00
5592af2455 Fix shortcuts 2023-09-25 16:41:24 +03:00
1c87b26c41 Fix shortcuts 2023-09-25 11:48:40 +03:00
349ad8c4e3 Fix shortcuts 2023-09-22 13:53:03 +03:00
trovier
0b4cf6e927 Fixes as per testing. 2023-09-21 16:42:29 +02:00
33be0b04fc Fix shortcuts 2023-09-21 13:14:28 +03:00
3ab9787f79 Fix shortcuts 2023-09-20 17:33:38 +03:00
9fabe64535 Fix shortcuts 2023-09-20 14:44:16 +03:00
defad54b3f New fixes for macOS shortcuts 2023-09-19 18:27:11 +03:00
dab7e87352 Edit shortcuts 2023-09-18 13:08:26 +03:00
5316459f30 Add new fixes for macOS shortcuts 2023-09-15 18:20:09 +03:00
trovier
5206fec97f German translation 2023-09-15 16:51:52 +02:00
trovier
b1eaeed701 Fixes as per testing: Navigation, Advanced Settings, Insert Symbols (EN only) 2023-09-14 15:04:16 +02:00
9809e4b33a Add shortcuts for v 7.5 2023-09-14 15:27:50 +03:00
trovier
2ff7a10c3b Initial German translation: Document Editor 2023-09-13 17:18:15 +02:00
trovier
a4b2b85373 Document Editor: hyphenation 2023-08-30 17:16:57 +02:00
trovier
894d08e290 Document Editor fixes. 2023-08-29 02:08:11 +02:00
trovier
4bc212d0fb All editors fixes. 2023-08-29 02:07:01 +02:00
fac4525cdc Add new fixes for shortcuts 2023-08-22 11:14:00 +03:00
1b5c5920a6 Merge branch 'develop' into feature/shortcuts 2023-08-16 18:50:47 +03:00
3e1871e378 Move editor.css to common folder according to changes in web-apps 2023-08-14 16:52:35 +03:00
8d4c51e0f1 Finish adding new shortcuts. Update screens (en, ru) 2023-08-03 13:01:00 +03:00
44548a68be Add shortcuts 2023-08-02 15:53:45 +03:00
13d8ab45dd Add shortcuts 2023-08-01 18:40:54 +03:00
76560a7041 Add shortcuts 2023-07-31 18:51:53 +03:00
417950a40a Add shortcuts 2023-07-28 10:46:55 +03:00
b881b7802d Merge branch 'feature/chatgpt' into release/1.14.0
# Conflicts:
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/UsageInstructions/ChatGPT.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/UsageInstructions/ChatGPT.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/ChatGPT.htm
2023-07-27 13:09:05 +03:00