|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
f2c09584fa
|
Cut paths for /userguides/mobile-android.aspx (p2) + escape from LocalizeContent for videos.
|
2022-02-28 15:07:40 +03:00 |
|
|
9a0398cf43
|
Add videos: Integrate Redmine, Fillable forms
|
2022-02-25 19:25:59 +03:00 |
|
|
c8b2ff8186
|
Updates: Community disabled; Birthdays moved to People
|
2022-02-24 16:25:12 +03:00 |
|
|
9806e697fa
|
Rename controls
|
2022-02-15 17:04:43 +03:00 |
|
|
dc9a9bfd94
|
Add ONLYOFFICE Personal section
|
2022-02-01 13:52:38 +03:00 |
|
|
10f5de0de3
|
Merge branch 'feature/forms-new' into feature/docs-7.0
# Conflicts:
# Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/SavePrintDownload.htm
|
2021-12-17 13:20:27 +03:00 |
|
|
f0241371ad
|
Move forms to a new branch
|
2021-12-17 09:45:35 +03:00 |
|
|
481cbd1cd5
|
Add new and update existing articles for 7.0
|
2021-12-03 18:18:12 +03:00 |
|
SvetlanaLisina
|
5526849ebf
|
Фикс прекомпиляции хелпцентра
# Conflicts:
# Web/Controls/Help/GettingStarted/Integration/Jira/GettingStartedJira.ascx
# Web/Controls/Help/GettingStarted/Integration/Mattermost/GettingStartedMattermost.ascx
# Web/Integration/gettingstarted-mattermost.aspx
# Web/Integration/gettingstarted-redmine.aspx
|
2021-11-24 19:02:19 +03:00 |
|
|
3c96613965
|
Mobile side menus translated into German + minor fixes (typos, etc.) here and there.
|
2021-07-27 14:40:07 +03:00 |
|
|
b6dfb6e86d
|
Added new masters, index page, side menu, add new pages to lists
|
2021-07-20 13:16:36 +03:00 |
|
|
6e6798bad1
|
Hidden Forms (revert later)
|
2021-04-30 14:13:37 +03:00 |
|
|
e132c787b5
|
Structure changes: added Forms section to all new menus, updated links to editors pages in menus, renamed password aspx according to htm, added new pages to sitemap, updated tags
|
2021-03-30 14:23:37 +03:00 |
|
|
bae6674720
|
Fixed Plugins links - removed from HelpfulHints
|
2020-12-21 15:08:28 +03:00 |
|
|
5690aafa0a
|
Fixed Workshop docs link from UserGuides
|
2020-10-21 10:34:39 +03:00 |
|
|
4757c23b3f
|
Updated links in Integration section
|
2020-10-15 17:39:53 +03:00 |
|
|
8dd2162d58
|
Moved Managing subscriptions from Administration to User Guides; changed links for Connecting third-party storages in the Administration section
|
2020-10-14 17:16:47 +03:00 |
|
|
5154b2ef33
|
Changed products order in UserGuides; Added redirect for UserGuides articles
|
2020-10-13 18:31:05 +03:00 |
|
|
e8e4f03230
|
Minor UserGuides fixes
|
2020-10-13 16:50:16 +03:00 |
|
|
ff0401506d
|
Several links fixed in UserGuides, UserGuides aspx pages
|
2020-10-07 16:49:01 +03:00 |
|
|
1a6f6ae738
|
Userguides docs: guides, added video-support article, ArticleCompleteList articles renamed
|
2020-10-06 18:42:22 +03:00 |
|