|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b7e0c24f3a
|
Fix path
|
2022-04-20 20:22:21 +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 |
|
|
|
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 |
|
|
|
6583397eb4
|
Try to fix groups-authorization-keys.aspx
|
2022-03-30 23:53:26 +03:00 |
|
|
|
c7e046ecbc
|
Remove Watchvideo.ascx because of using Resource.resx instead.
|
2022-03-02 17:06:43 +03:00 |
|
|
|
80ec997a5f
|
Merge branch 'feature/workspace-11.6' into release/1.3.0
# Conflicts:
# Web/Controls/Help/GettingStarted/Documents/GettingStartedDocuments.ascx
# Web/Controls/Help/GettingStarted/Documents/GettingStartedDocuments.de.ascx
|
2022-01-14 15:35:08 +03:00 |
|
|
|
2a7ff597e7
|
Update articles
|
2021-11-30 14:54:58 +03:00 |
|
|
|
aee0042fcd
|
Add conditional formatting pt2 video
|
2021-11-12 13:08:55 +03:00 |
|
|
|
dc1f953061
|
Add new videos - SSO, HTML, Telegram notifications
|
2021-11-11 12:29:02 +03:00 |
|
|
|
c6690db248
|
Add videos to pages and update several images
|
2021-10-20 17:02:10 +03:00 |
|
|
|
88851c0b5c
|
Minor text fixes (UserGuides)
# Conflicts:
# Web/Controls/Help/UserGuides/WorkspaceMail.ascx
|
2021-02-11 17:41:01 +03:00 |
|
|
|
7825063f6e
|
Added Connecting third-party storages articles into Documents module (UserGuides)
|
2021-01-12 15:29:33 +03:00 |
|
|
|
f9d24baf19
|
Deleted Show more toggle from several UserGuides pages
|
2021-01-11 15:09:34 +03:00 |
|
|
|
5154b2ef33
|
Changed products order in UserGuides; Added redirect for UserGuides articles
|
2020-10-13 18:31:05 +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 |
|
|
|
f62c1ebbaa
|
Added UserGuides section
|
2020-10-01 20:23:38 +03:00 |
|
