|
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 |
|
|
cfbf4529b1
|
Merge branch 'feature/web-apps-help-german' into release/1.6.0
|
2022-08-02 14:27:19 +03:00 |
|
|
24d05d10a7
|
Merge branch 'feature/web-apps-help' of https://github.com/ONLYOFFICE/helpcenter into feature/web-apps-help
|
2022-08-02 13:12:31 +03:00 |
|
|
f6e115fe85
|
Merge branch 'feature/translations-fr-new' into feature/web-apps-help
# 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/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 13:12:08 +03:00 |
|
|
733c49a1cd
|
Merge branch 'feature/web-apps-help' of https://github.com/ONLYOFFICE/helpcenter into feature/web-apps-help
|
2022-08-02 12:20:36 +03:00 |
|
|
2a1ebe6a7f
|
build 7.2: ligatures and OLE objects.
|
2022-08-02 12:20:02 +03:00 |
|
|
ac73d26dc9
|
Merge branch 'feature/web-apps-help' of https://github.com/ONLYOFFICE/helpcenter into feature/web-apps-help
|
2022-08-02 10:59:43 +03:00 |
|
|
5f537bfe5e
|
Merge branch 'feature/fix-merge-cells' into feature/web-apps-help
# Conflicts:
# 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 10:58:59 +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 |
|
|
de163e5d2c
|
Build 7.2: new features, updated icons and screenshots.
|
2022-08-01 16:02:42 +03:00 |
|
|
ab7aac6ed8
|
Edit several UserGuides index pages
|
2022-08-01 15:13:02 +03:00 |
|
|
d50185a51b
|
Edit DE, SE, PE index pages
|
2022-07-31 15:25:38 +03:00 |
|
|
b4de073563
|
Finish editing controls for Video.ascx
|
2022-07-31 14:39:17 +03:00 |
|
|
b7e26405a4
|
Fix errors for iOSWebDocs.ascx
|
2022-07-29 19:38:51 +03:00 |
|
|
1c0b4aa46c
|
Continue editing controls for Video.ascx
|
2022-07-29 17:53:56 +03:00 |
|
|
96371109c3
|
Minor fix for images display in PE: Create Lists.
|
2022-07-29 13:32:20 +03:00 |
|
|
c5889817de
|
Start editing controls for Video.ascx
|
2022-07-28 18:48:15 +03:00 |
|
|
e4adf67c70
|
Fixes for images and articles.
|
2022-07-28 18:28:29 +03:00 |
|
|
53e6057d9b
|
Finish editing index pages for mobile apps
|
2022-07-28 17:35:57 +03:00 |
|
|
3cd32e96c5
|
Merge branch 'feature/web-apps-help-fr' into release/1.6.0
|
2022-07-28 16:52:25 +03:00 |
|
|
90330e5158
|
Merge branch 'feature/web-apps-help' into release/1.6.0
|
2022-07-28 16:52:04 +03:00 |
|
|
e5a6b5081f
|
Continue editing pages for mobile apps
|
2022-07-28 16:50:13 +03:00 |
|
|
66e9d3a012
|
Update Changelog.md
|
2022-07-28 15:14:34 +03:00 |
|
|
f230a4670c
|
Merge branch 'feature/contribution_rework' into release/1.6.0
|
2022-07-28 15:05:44 +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 |
|
|
dbe8863ef8
|
Update Changelog.md
|
2022-07-28 14:12:38 +03:00 |
|
|
e3fda6b9a8
|
Merge branch 'feature/system-requirements' into release/1.6.0
|
2022-07-28 13:48:11 +03:00 |
|
|
8d54cfdfb9
|
Merge branch 'feature/personal_1.2' into release/1.6.0
|
2022-07-28 13:21:59 +03:00 |
|
|
dcb898692b
|
Merge branch 'feature/nextcloud' into release/1.6.0
# Conflicts:
# Web/Controls/Help/Server/ControlPanel/NextcloudMigration/nextcloud-migration.de.ascx
# Web/Controls/Help/Server/Docker/DockerTroubleshooting/DockerTroubleshooting.de.ascx
|
2022-07-28 13:15:58 +03:00 |
|
|
c9c4f7a7e5
|
Merge branch 'feature/connect-docs' into release/1.6.0
|
2022-07-28 13:09:45 +03:00 |
|
|
15aa883871
|
Continue editing index pages for mobile apps
|
2022-07-27 18:34:04 +03:00 |
|
|
e16db04f8c
|
Updated images in EN for all editors.
|
2022-07-27 17:19:40 +03:00 |
|
|
343db094f0
|
Edit SideMenu - Coediting, fr
|
2022-07-27 16:31:41 +03:00 |
|
|
baebd570be
|
Change class for contribution pages to remove floating menu on the left
|
2022-07-27 15:44:06 +03:00 |
|
|
58887bd2e5
|
Try to add new path to Images folder - DocHelpParcing.cs
|
2022-07-27 15:33:19 +03:00 |
|
|
2919f512b8
|
Fixes for images in Document Editor, German.
|
2022-07-27 14:48:48 +03:00 |
|
|
9262be26e3
|
Edit index pages for mobile apps
|
2022-07-27 14:36:53 +03:00 |
|
|
4fd5daba74
|
Edit MobileWeb.ascx
|
2022-07-26 18:13:11 +03:00 |
|
|
1027d2d0b6
|
Updated EN interface screenshots for editors.
|
2022-07-26 17:46:01 +03:00 |
|
|
2fcbfca213
|
Update translations (FR) - Collaboration section
|
2022-07-26 13:42:44 +03:00 |
|
|
96d4843d32
|
Update system requirements for Workspace
|
2022-07-26 12:53:10 +03:00 |
|
|
6df1dade7b
|
Minor fix: update what's new section
|
2022-07-26 11:39:55 +03:00 |
|