Commit Graph

69 Commits

Author SHA1 Message Date
5f94f31004 Merge branch 'feature/docspace' into release/1.12.0
# Conflicts:
#	Web/Controls/Common/BaseHeader/BaseHeader.fr.ascx
#	Web/Controls/Help/GettingStarted/Configuration/Configuration.ascx
#	Web/css/help.less
2023-04-21 17:05:07 +03:00
d5e577302f Add 3 new articles 2023-04-13 18:43:49 +03:00
09810df6fe updated translations fr 2023-02-28 11:55:39 +03:00
ca28b918c3 Merge branch 'feature/edit-fr_12.5' into feature/workspace-12.5 2023-02-22 15:37:25 +03:00
83210312ae Merge branch 'develop' into feature/workspace-12.5
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
2023-02-22 15:11:53 +03:00
trovier
a21530189a German translation. 2023-02-21 21:35:27 +01:00
f9b6b60058 updated translation fr 2023-02-20 11:57:36 +03:00
7534fba2e6 updated translations fr 2023-02-15 16:17:52 +03:00
3236c11dd9 Fixes for Two-Factor Authentication 2023-02-14 17:51:33 +03:00
24709dff71 updated translation fr 2023-02-14 17:23:00 +03:00
ca07580d90 Update DocSpace articles 2023-02-03 15:57:56 +03:00
672f5853cc Start adding DocSpaceSettings.ascx 2023-01-24 16:52:14 +03:00
250abfaf45 Add translations (Administration, FR) 2023-01-16 12:01:38 +03:00
34edd26c06 Updates for memory quota 2023-01-11 10:39:30 +03:00
2e8b8fcfb6 Updates for v12.5 (impersonation, dark theme, branding, password length) 2022-12-13 16:27:21 +03:00
87b805ab47 Update Configuration.ascx and several articles 2022-11-21 18:15:38 +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
2e8a5aa4ec Update Configuration.ascx: DNS settings, restore missing section, remove unused text 2022-03-01 16:44:57 +03:00
e202c96c03 Update white labeling 2022-03-01 12:42:57 +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
50c450362d Rename white-labeling and workspace 2021-11-25 19:03:09 +03:00
3595eabe0a German translation completed. 2021-10-13 23:15:34 +03:00
16d164fe33 Fixed </div> tags and SSO heading 2021-10-08 10:47:03 +03:00
3323bcf973 Configuration.ascx complete rework in German. 2021-10-07 17:02:11 +03:00
f397f53e04 Fixed image paths - fr 2021-06-03 18:01:05 +03:00
f74d30008f Added translations (fr) 2021-05-18 13:07:20 +03:00
b7bfb04d35 Added a note for restore 2021-04-28 14:13:28 +03:00
cf917bcf5b Updated Restore instructions (Set password) 2021-04-21 14:22:26 +03:00
6bd5a4ee80 Updated Migration instruction (Set password) 2021-04-20 11:16:50 +03:00
4ff8807885 Updated screenshots in German: data backup, getting started/documents, guides 2021-04-16 15:13:22 +03:00
442025b414 Added a note for automatic backup 2021-04-16 12:40:00 +03:00
2cb7ebc688 Added German for new info on pricing + FAQ + backup/restore + full-text search 2021-04-15 18:33:25 +03:00
793d127aee Additional fixes and translations (ru) 2021-04-14 15:11:39 +03:00
b91f53f128 Structure fixes 2021-04-12 18:32:20 +03:00
8a53a3e794 Translation into German for SSO and LDAP + screenshots. 2021-04-12 17:19:28 +03:00
27e34198a4 Updated Migration section in Getting Started 2021-04-09 16:38:04 +03:00
4a664bcad4 Fixed: LDAP and SSO for SaaS - tags, controls, screenshots.
Deleted control-panel-sso-description.aspx
2021-04-09 14:45:31 +03:00
27bfbcc119 Structure fixes, updated Getting Started screens 2021-04-09 12:00:39 +03:00
04c3231f6b Structure changes in Getting Started - Configuration, added Restore backup section 2021-04-08 20:05:19 +03:00
faca3f5fd9 Fixed LDAP and SSO (links and controls) + edited UsingSearch.ascx for SaaS. 2021-04-07 18:49:03 +03:00
48e2d032b7 Administration guides updates 2020-10-09 17:53:03 +03:00
6e9721f127 Changed links in GS articles 2020-10-08 17:14:50 +03:00
f9b66ddaf0 Administration section 2020-10-06 13:05:16 +03:00
e70b3d038f Updated SaaS version backup articles 2020-09-03 12:42:44 +03:00
9ee3603433 Fixes for Audit trail description 2020-08-27 19:49:20 +03:00
44322fdab0 Updates: Getting Started - Portal Configuration, How to use two-factor authentication 2020-07-24 15:50:27 +03:00
8600b34e05 Update: the password must be at least 8 characters long 2020-07-24 14:47:00 +03:00