|
dd815fd58a
|
Rename controls
|
2023-04-26 15:54:43 +03:00 |
|
|
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 |
|
|
043689366c
|
Merge branch 'feature/workspace-12.5' into release/1.11.0
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.es.resx
# Web/App_GlobalResources/Resource.fr.resx
# Web/App_GlobalResources/Resource.resx
# Web/App_GlobalResources/Resource.ru.resx
# Web/Controls/Help/ABCIndex/ABCCompleteArticleList.ascx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/CommunicationPlugins.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/HTML.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/HighlightedCode.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertReferences.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Jitsi.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/PhotoEditor.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Speech.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Thesaurus.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Translator.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Typograf.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/WordCounter.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/CommunicationPlugins.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/HighlightedCode.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/PhotoEditor.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/Thesaurus.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/Translator.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/CommunicationPlugins.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/HighlightedCode.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/PhotoEditor.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/Thesaurus.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/Translator.aspx
|
2023-03-24 16:21:30 +03:00 |
|
|
09ebfc9941
|
Edit See Also block for two pages
|
2023-03-21 16:21:44 +03:00 |
|
|
d153102a14
|
Edit controls in articles complete list, edit several tags
|
2023-03-15 17:30:01 +03:00 |
|
|
2e85a9408e
|
Continue fixes in ArticlesCompleteList
|
2023-03-10 14:13:11 +03:00 |
|
|
ca6ab5d94a
|
Partial structure fixes in ArticlesCompleteList
|
2023-03-09 14:40:17 +03:00 |
|
|
dd94c3ba6d
|
Rename controls with the same names, fix paths to icons
|
2023-02-13 13:14:30 +03:00 |
|
|
abf8b2932a
|
Finish adding separate DocSpace articles
|
2023-02-09 15:12:20 +03:00 |
|
|
f0ed1c86fe
|
Add several articles about third-party services
|
2023-02-07 14:57:15 +03:00 |
|
|
672f5853cc
|
Start adding DocSpaceSettings.ascx
|
2023-01-24 16:52:14 +03:00 |
|
|
a1d45f1312
|
Add RoomManagerSettings.ascx
|
2023-01-24 10:18:06 +03:00 |
|
|
e1cf298bd7
|
Start adding new articles for DocSpace
|
2023-01-20 12:40:06 +03:00 |
|
|
c3e589e3eb
|
Edit several tags
|
2022-11-02 16:26:50 +03:00 |
|
|
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 |
|
|
b4de073563
|
Finish editing controls for Video.ascx
|
2022-07-31 14:39:17 +03:00 |
|
|
ceab06d0f7
|
Remove duplicates, unnecessary controls, edit See also links
|
2022-07-13 14:36:26 +03:00 |
|
|
869bfe603e
|
Continue editing sitemaps and structure fixes
|
2022-06-08 18:35:08 +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 |
|
|
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 |
|
|
c4f55eb453
|
Partial fixes for desktop-video-support.aspx
|
2022-03-31 19:19:58 +03:00 |
|
|
612925a715
|
Fix for groups-gettingstarted-projects.aspx
|
2022-03-31 16:53:57 +03:00 |
|
|
541bc4c7f6
|
Try to fix workspace-saas-change-payment-plan.aspx
|
2022-03-31 13:12:04 +03:00 |
|
|
6583397eb4
|
Try to fix groups-authorization-keys.aspx
|
2022-03-30 23:53:26 +03:00 |
|
|
60f121b540
|
Try to fix administration/control-panel-ldap.aspx
|
2022-03-29 17:25:47 +03:00 |
|
|
abd9e76396
|
Fixes for groups-gettingstarted-projects.aspx - Part 2
|
2022-03-25 14:13:39 +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 |
|
|
2f1ac5ec73
|
Add Project module changes, Active connections article. Update screenshots and tags
|
2022-03-09 18:24:41 +03:00 |
|
|
9806e697fa
|
Rename controls
|
2022-02-15 17:04:43 +03:00 |
|
|
a8f6e2c1be
|
Fix personal troubleshooting
|
2022-02-02 15:39:39 +03:00 |
|
|
dc9a9bfd94
|
Add ONLYOFFICE Personal section
|
2022-02-01 13:52:38 +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 |
|
|
1d8deb3700
|
Updates and fixes
|
2021-11-29 16:38:40 +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 |
|
|
28e6b756d3
|
Add translations (fr) - UserGuides index pages
|
2021-10-28 11:42:35 +03:00 |
|
|
0ed59c9637
|
Merge branch 'feature/fr-translations' into release/1.0.0
|
2021-10-07 19:03:11 +03:00 |
|
|
301bc21088
|
Remove "outofdate" for new articles
|
2021-10-06 15:32:03 +03:00 |
|
|
b6dfb6e86d
|
Added new masters, index page, side menu, add new pages to lists
|
2021-07-20 13:16:36 +03:00 |
|
|
af644f138e
|
Updated UsingSearch article and several CRM guides, added new page to the User Guides section
|
2021-04-08 16:13:13 +03:00 |
|
|
88851c0b5c
|
Minor text fixes (UserGuides)
# Conflicts:
# Web/Controls/Help/UserGuides/WorkspaceMail.ascx
|
2021-02-11 17:41:01 +03:00 |
|
|
70786712a7
|
Minor fixes
|
2021-01-12 17:27:28 +03:00 |
|
|
9759255cde
|
Fixed header color for current section (UserGuides and Integration)
|
2021-01-12 14:55:21 +03:00 |
|
SvetlanaLisina
|
260f32ad5c
|
Сhange of old names Workspace
|
2020-11-05 14:27:02 +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 |
|
|
adda8818aa
|
Changed UserGuides Sidemenu highlight
|
2020-10-13 16:49:50 +03:00 |
|
|
a80800dc42
|
Fixed Mail troubleshooting GS links
|
2020-10-12 17:29:38 +03:00 |
|