|
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 |
|
|
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 |
|
|
ceab06d0f7
|
Remove duplicates, unnecessary controls, edit See also links
|
2022-07-13 14:36:26 +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 |
|
|
4b016334ac
|
Fix administration/configuration.aspx
|
2022-04-05 12:57:43 +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 |
|
|
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 |
|
|
c8b2ff8186
|
Updates: Community disabled; Birthdays moved to People
|
2022-02-24 16:25:12 +03:00 |
|
|
5f5507fead
|
Add LanguageTool plugin video; Update thumbnails for videos; Add video scroller to UserGuides Docs pages; Minor fixes for ascx pages
|
2021-12-07 16:33:05 +03:00 |
|
|
edd080477f
|
Ver.4: Fixes for headers, buttons, articles.
|
2021-06-09 17:30:46 +03:00 |
|
|
a61a8befe3
|
Added German for index pages, OO Docs articles.
|
2021-04-21 13:43:22 +03:00 |
|