|
|
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 |
|
|
|
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 |
|
|
|
1c0b4aa46c
|
Continue editing controls for Video.ascx
|
2022-07-29 17:53:56 +03:00 |
|
|
|
c5889817de
|
Start editing controls for Video.ascx
|
2022-07-28 18:48:15 +03:00 |
|
|
|
15aa883871
|
Continue editing index pages for mobile apps
|
2022-07-27 18:34:04 +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 |
|
|
|
333e5241a1
|
Edit tags for InsertTables.aspx
|
2022-07-22 14:27:12 +03:00 |
|
|
|
13f97f4089
|
Start editing mobile pages
|
2022-07-16 21:31:56 +03:00 |
|
|
|
8bd87f869e
|
Add translations for Android Projects (fr)
|
2022-07-15 11:57:15 +03:00 |
|
|
|
4a089bbf64
|
Edit IDs
|
2022-07-14 21:05:23 +03:00 |
|
|
|
55ca46d2a9
|
Try to edit CellProperties.ascx
|
2022-07-14 19:23:43 +03:00 |
|
|
|
ceab06d0f7
|
Remove duplicates, unnecessary controls, edit See also links
|
2022-07-13 14:36:26 +03:00 |
|
|
|
37f049a993
|
Add new translations
|
2022-07-12 13:12:49 +03:00 |
|
|
|
7e2191aa30
|
Edit cell-formatting.ascx tag
|
2022-07-06 17:26:16 +03:00 |
|
|
|
e9a474633d
|
Edit operations-with-cells.ascx tag
|
2022-07-05 16:55:34 +03:00 |
|
|
|
8ceeeebb9f
|
Some more structure fixes for editors pages
|
2022-05-09 19:18:34 +03:00 |
|
|
|
8d71664100
|
Merge branch 'feature/helpcenter_12.0-for-release' into release/1.4.0
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.resx
# Web/Controls/Help/HelpCenter.de.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.es.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.it.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.ru.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ToolsAndSettings/ToolsAndSettingsDocument.es.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ToolsAndSettings/ToolsAndSettingsDocument.it.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/OperationsOnObjects/PEOperationsOnObjects.de.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/OperationsOnObjects/PEOperationsOnObjects.es.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.de.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.es.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.it.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/SpreadsheetEditor/OperationsOnObjects/SEOperationsOnObjects.es.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/SpreadsheetEditor/OperationsOnObjects/SEOperationsOnObjects.it.ascx
# Web/Controls/Help/VariousControls/LocalizeControls/SpreadsheetProtection/LocalizeSpreadsheetProtection.ascx
# Web/OfficeWeb/apps/documenteditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
# Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
# Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Review.htm
# Web/OfficeWeb/apps/documenteditor/main/resources/help/en/images/acceptreject_dropdown.png
# Web/OfficeWeb/apps/presentationeditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
# Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
# Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
# Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
|
2022-05-09 17:02:25 +03:00 |
|
|
|
70b16b8db0
|
Structure fix for editors pages
|
2022-05-09 14:06:35 +03:00 |
|
|
|
b6d215af76
|
Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release
# Conflicts:
# Web/Controls/Help/Administration/Administration.de.ascx
# Web/Controls/Help/Administration/ControlPanel.de.ascx
|
2022-04-21 09:14:00 +03:00 |
|
|
|
b7e0c24f3a
|
Fix path
|
2022-04-20 20:22:21 +03:00 |
|
|
|
d691ecc6d8
|
Feed tool: main page, header + German. AuthorizationKeys.de.ascx fixes. ControlPanel.de.ascx fixes.
|
2022-04-20 17:40:51 +03:00 |
|
|
|
1dc034de40
|
Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release
# Conflicts:
# Web/Controls/Help/Administration/Administration.ascx
# Web/Controls/Help/Administration/ControlPanel.ascx
# Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.ascx
# Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.de.ascx
# Web/Controls/Help/ArticlesCompleteList/Guides/151_share_text/151_share_text.ascx
# Web/Controls/Help/ArticlesCompleteList/ONLYOFFICEEditors/2021_using-chat.ascx
# Web/Controls/Help/ArticlesCompleteList/TipsTricks/130_folder_permissions/130_folder_permissions.ascx
# Web/Controls/Help/Desktop/Documents/Common/PrivateRoom/PrivateRoom.de.ascx
# Web/Controls/Help/GettingStarted/Projects/GettingStartedProjects.de.ascx
# Web/Controls/Help/Guides/Documents/ShareDocuments/ShareDocuments.ascx
# Web/Controls/Help/ONLYOFFICEEditors/EditorsUserGuides/EditorsUserGuides.ascx
# Web/Controls/Help/Tags/generate-report/generate-report.ascx
# Web/Controls/Help/Tags/generate-report/generate-report.de.ascx
# Web/Controls/Help/Tags/manage-access-rights/manage-access-rights.ascx
# Web/Controls/Help/Tags/onlyoffice-people/onlyoffice-people.ascx
# Web/Controls/Help/Tags/onlyoffice-people/onlyoffice-people.de.ascx
# Web/Controls/Help/Tags/onlyoffice-projects/onlyoffice-projects.ascx
# Web/Controls/Help/Tags/onlyoffice-projects/onlyoffice-projects.de.ascx
# Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.ascx
# Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.de.ascx
# Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.es.ascx
# Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.fr.ascx
# Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.it.ascx
# Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.ru.ascx
# Web/Controls/Help/Tags/report-templates/report-templates.ascx
# Web/Controls/Help/Tags/report-templates/report-templates.de.ascx
# Web/Controls/Help/Tags/security/security.ascx
# Web/Controls/Help/Tags/security/security.de.ascx
# Web/Controls/Help/Tags/track-birthdays/track-birthdays.ascx
# Web/Controls/Help/Tags/track-birthdays/track-birthdays.de.ascx
# Web/Controls/Help/Tags/track-birthdays/track-birthdays.es.ascx
# Web/Controls/Help/Tags/track-birthdays/track-birthdays.fr.ascx
# Web/Controls/Help/Tags/track-birthdays/track-birthdays.it.ascx
# Web/Controls/Help/Tags/track-birthdays/track-birthdays.ru.ascx
# Web/Controls/Help/UserGuides/DocsGuides.ascx
# Web/Controls/Help/UserGuides/DocsGuides.de.ascx
# Web/Controls/Help/UserGuides/DocsGuides.fr.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/Groups.ascx
# Web/Controls/Help/UserGuides/Groups.de.ascx
# Web/Controls/Help/UserGuides/GroupsDocuments.ascx
# Web/Controls/Help/UserGuides/GroupsMail.de.ascx
# Web/Controls/Help/UserGuides/GroupsProjects.ascx
# Web/Controls/Help/UserGuides/GroupsProjects.de.ascx
# Web/Controls/Help/UserGuides/UserGuides.ascx
# Web/ONLYOFFICE-Editors/Editors-User-Guides/DocumentEditor/Add-watermark.aspx
# Web/ONLYOFFICE-Editors/Editors-User-Guides/SpreadsheetEditor/Merge-and-unmerge-cells.aspx
# Web/ONLYOFFICE-Editors/Editors-User-Guides/SpreadsheetEditor/Merge-cells.aspx
|
2022-04-20 16:11:30 +03:00 |
|
|
|
97f05e4c4e
|
CardDAV - new section in People module (EN+DE).
|
2022-04-19 14:56:03 +03:00 |
|
|
|
9fedee2516
|
Fixes, translations, screenshots for German version. OO Groups Documents module page is reworked in English.
|
2022-04-15 18:19:11 +03:00 |
|
|
|
fc9e289ae6
|
German for a part of new fixes + intermediate (!) for GettingStartedDocuments.de.ascx
|
2022-04-11 14:34:36 +03:00 |
|
|
|
e7fb15c3ed
|
Fix for mail.aspx in languages
|
2022-04-07 14:02:14 +03:00 |
|
|
|
4b016334ac
|
Fix administration/configuration.aspx
|
2022-04-05 12:57:43 +03:00 |
|
|
|
f40394df57
|
Try to fix groups-guides-documents-collaborative-editing.aspx
|
2022-04-04 16:59:50 +03:00 |
|
|
|
4da7d887ff
|
Fix insert-objects.ascx for desktop-video-support.aspx
|
2022-04-04 11:41:57 +03:00 |
|
|
|
6583397eb4
|
Try to fix groups-authorization-keys.aspx
|
2022-03-30 23:53:26 +03:00 |
|
|
|
11539f099b
|
Fixes for groups-gettingstarted-projects.aspx Part 1
|
2022-03-24 09:59:42 +03:00 |
|
|
|
d2aa901864
|
Fix watchvideo_block for new Personal page
|
2022-03-17 16:21:11 +03:00 |
|
|
|
dfb9965ae6
|
Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release
# Conflicts:
# Web/Controls/Help/Tags/collaborative-editing/collaborative-editing.ascx
|
2022-03-17 16:04:18 +03:00 |
|
|
|
ac97b28cf3
|
Merge branch 'feature/test-3-branches-further-changes' into feature/test-merge-for-release
|
2022-03-17 13:10:38 +03:00 |
|
|
|
2f1ac5ec73
|
Add Project module changes, Active connections article. Update screenshots and tags
|
2022-03-09 18:24:41 +03:00 |
|
|
|
9e1b221ee7
|
Merge branch 'feature/helpcenter_12.0' of https://github.com/ONLYOFFICE/helpcenter into feature/helpcenter_12.0
|
2022-03-03 13:32:02 +03:00 |
|
|
|
d399150766
|
Reworked OO Docs indexes in EN, DE, ES, IT, FR; changed screenshots as per build 12.0; fixed ChangingSettings (auto Trash bin).
|
2022-03-03 13:31:08 +03:00 |
|
|
|
9209fac24c
|
Revert 15b380b10d and fixes for /userguides/mobile-android.aspx.
|
2022-03-03 00:46:50 +03:00 |
|
|
|
cf268bf695
|
Remove HideContents.ascx because of using Resource.resx instead.
|
2022-03-02 17:42:41 +03:00 |
|
|
|
c7df67bf43
|
Remove ShowContents.ascx because of using Resource.resx instead.
|
2022-03-02 17:32:08 +03:00 |
|
|
|
c7e046ecbc
|
Remove Watchvideo.ascx because of using Resource.resx instead.
|
2022-03-02 17:06:43 +03:00 |
|
|
|
393bea7e2d
|
Remove ComOpersAndr.ascx because of using Resource.resx instead.
|
2022-03-02 16:55:24 +03:00 |
|
|
|
15b380b10d
|
Temporary comment huge localized block on /userguides/mobile-android.aspx for testing.
|
2022-03-02 16:11:11 +03:00 |
|
|
|
2c9bf74e9c
|
Try to fix /userguides/mobile-android.aspx by using Resource.resx + changes for another pages with adding controls.
|
2022-03-02 16:10:08 +03:00 |
|
|
|
90ca22aade
|
Escape from LocalizeContent for /userguides/mobile-android.aspx.
|
2022-02-28 15:42:06 +03:00 |
|
|
|
f2c09584fa
|
Cut paths for /userguides/mobile-android.aspx (p2) + escape from LocalizeContent for videos.
|
2022-02-28 15:07:40 +03:00 |
|
|
|
7983f05964
|
Cut paths for /userguides/mobile-android.aspx (p1).
|
2022-02-28 14:49:15 +03:00 |
|
