Commit Graph

3614 Commits

Author SHA1 Message Date
1d26327ea1 edit fr 2022-08-19 15:11:54 +03:00
d57a97a81b edit fr 2022-08-19 11:50:07 +03:00
b8f567a3c9 edit fr 2022-08-18 17:39:36 +03:00
43a4c03021 Merge branch 'feature/web-apps-help' of https://github.com/ONLYOFFICE/helpcenter into feature/web-apps-help 2022-08-18 17:37:56 +03:00
261032f344 edit fr 2022-08-18 17:37:21 +03:00
2d4ed678ec Build 7.2: Fixes for German. 2022-08-18 17:21:35 +03:00
d9720f2c89 edit fr 2022-08-18 16:57:03 +03:00
6d868d7522 edit fr 2022-08-18 16:26:03 +03:00
1ac356d00a edit fr 2022-08-18 15:23:55 +03:00
8c378f27e7 edit fr 2022-08-18 12:01:15 +03:00
533a38bc8d edit fr 2022-08-17 18:30:38 +03:00
29aa15a404 edit fr 2022-08-15 18:39:20 +03:00
731ba66489 edit fr 2022-08-13 15:45:07 +03:00
25e91d7971 Merge branch 'feature/build7.2' into feature/web-apps-help
# Conflicts:
#	Web/Controls/Help/Guides/Documents/ShareDocuments/ShareDocuments.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/images/paradvsettings_font.png
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/images/interface/rightpart.png
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/images/access_rights.png
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/images/interface/rightpart.png
2022-08-12 16:20:37 +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
97e3afadf3 Merge branch 'feature/web-apps-help' of https://github.com/ONLYOFFICE/helpcenter into feature/web-apps-help 2022-08-12 14:19:43 +03:00
b2e57ce524 Build 7.2: new keyboard shortcut, minor fixes. 2022-08-12 14:16:25 +03:00
8666b2f507 Merge branch 'feature/web-apps-help' of https://github.com/ONLYOFFICE/helpcenter into feature/web-apps-help 2022-08-12 13:24:25 +03:00
7ebdca3d37 Partial translations - 7.2 - ru 2022-08-12 13:23:42 +03:00
a9179880da edit fr 2022-08-11 17:56:03 +03:00
18f160f1ea edit images (fr) 2022-08-10 17:36:23 +03:00
07f3955e82 Build 7.2: updated desktop interface screenshots (EN+DE), added Live Viewer (EN+DE), added renaming files in the editors (EN+DE), minor fixes (EN+DE). 2022-08-10 17:12:50 +03:00
96721b1cb4 Edit left menu for contribution pages 2022-08-10 16:37:39 +03:00
51607baf68 Fix links for Installation pages 2022-08-09 13:53:21 +03:00
1730ad8322 Fixes for UserGuides pages 2022-08-09 11:54:14 +03:00
5a83775436
Merge pull request #25 from ONLYOFFICE/feature/config-docs-7.2
Docs config v7.2
2022-08-09 10:39:03 +03:00
1cf0acf960 updated docs config for v7.2 2022-08-09 10:31:23 +03:00
de69896009 Add missing link to MobileProjects.ascx 2022-08-08 20:24:49 +03:00
0780038901 Continue translating changes for 7.2 (ru) 2022-08-08 20:10:29 +03:00
9ca2710179 Deleted cut.png and select_all.png 2022-08-08 18:01:20 +03:00
4a957193ec Build 7.2: English fixes. 2022-08-08 17:52:30 +03:00
2dddda225d Build 7.2: German translation and fixes 2022-08-08 17:51:54 +03:00
9be8e2bf63 Merge branch 'feature/elasticsearch-version' into release/1.6.0 2022-08-08 11:19:52 +03:00
085c6dbdc5 Update Changelog.md 2022-08-06 12:20:03 +03:00
455e5ee94d Merge branch 'feature/geolocation' into release/1.6.0 2022-08-06 12:15:30 +03:00
c25f115ffa Start translating new changes for 7.2 (ru) 2022-08-06 12:14:32 +03:00
d0d1cad623 Update readme 2022-08-04 15:46:17 +03:00
4bdfb783e1 Copied styles from sprite.css to help.less 2022-08-04 15:38:12 +03:00
2c92bc3d0e Remove section in ActiveConnections.ascx 2022-08-04 14:15:42 +03:00
7b4f0cd61f Update elasticsearch version 2022-08-04 13:41:22 +03:00
df16ca3d3c Fix ActiveConnections.ascx 2022-08-04 11:11:10 +03:00
3c2c03cc1a Some fixes 2022-08-03 17:52:15 +03:00
ed07c1e6ac Fix paths to icons in Documents module guides 2022-08-03 17:00:01 +03:00
0fb35dcc2d Fixes for MergeCells.htm: rename some images and add 1 image in OfficeWeb, remove unnecessary images in Guides/big/ 2022-08-03 11:25:58 +03:00
4a3695e58c Edit MergeCells.htm 2022-08-02 20:09:11 +03:00
77d0d3492a Minor fix for SysReqs_CPU2.fr.ascx, update Changelog.md 2022-08-02 17:48:14 +03:00
e6a632186d Merge branch 'feature/translations-fr-new' into release/1.6.0
# Conflicts:
#	Web/AdministratorGuides/Mass-mailing.aspx
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.es.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.it.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/App_GlobalResources/Resource.ru.resx
#	Web/Controls/Help/ArticlesCompleteList/DeveloperEdition/150017_change_themes_de.de.ascx
#	Web/Controls/Help/Installation/Desktop.de.ascx
#	Web/Controls/Help/Installation/Installation.ascx
#	Web/Controls/Help/Installation/Installation.de.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.de.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.es.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.fr.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.ru.ascx
#	Web/Controls/Help/Tags/add-event/add-event.de.ascx
#	Web/Controls/Help/Tags/change-color/change-color.ascx
#	Web/Controls/Help/Tags/change-color/change-color.de.ascx
#	Web/Controls/Help/Tags/change-color/change-color.es.ascx
#	Web/Controls/Help/Tags/create-event/create-event.de.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.de.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.es.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.fr.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.it.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.ru.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.de.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.fr.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.ru.ascx
#	Web/Controls/Help/UserGuides/DocsSE.ascx
#	Web/Controls/Help/UserGuides/DocsSE.de.ascx
#	Web/Controls/Help/UserGuides/DocsSE.fr.ascx
#	Web/Controls/Help/UserGuides/DocsSE.it.ascx
#	Web/Controls/Help/UserGuides/DocsSE.ru.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/GroupsDocuments.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.de.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.fr.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.ru.ascx
2022-08-02 17:14:15 +03:00
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
6772fda665 Merge branch 'feature/web-apps-help' of https://github.com/ONLYOFFICE/helpcenter into feature/web-apps-help 2022-08-02 15:00:59 +03:00
f958aa31f2 Merge remote-tracking branch 'remotes/origin/feature/web-apps-help-german' into feature/web-apps-help 2022-08-02 15:00:09 +03:00