Commit Graph

169 Commits

Author SHA1 Message Date
97e7d7e3bf Merge branch 'feature/confluence4.3.1' into release/1.14.0 2023-07-27 13:16:06 +03:00
trovier
49c6083661 Initial commit EN 2023-07-25 14:59:54 +02:00
c9d85e1408 Fix screens 2023-07-19 10:47:36 +03:00
4817310129 Update screenshots 2023-07-13 18:04:02 +03:00
0fe2dc8fc5 Update DocSpace guides for v1.1.0 2023-07-12 16:26:05 +03:00
d6bd3e845f Merge branch 'feature/build_7.4' into release/1.13.0 2023-06-13 11:36:13 +03:00
e6e458b922 Merge branch 'develop' into feature/build_7.4
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
#	Web/Controls/Help/GettingStarted/Documents/GettingStartedDocuments.ascx
2023-06-01 15:59:33 +03:00
trovier
b841176b3a Fixes as per testing (navigation, plugin manager, desktop getting started) 2023-05-31 13:57:37 +02:00
trovier
9d413b15d5 Initial commit 2023-05-16 16:27:32 +02:00
trovier
8d1f358c79 Updated desktop interface screenshots 2023-05-10 14:55:48 +02: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
b391418164 Text fixes, update screens - DocSpaceSettings.ascx 2023-04-17 12:31:17 +03:00
d5e577302f Add 3 new articles 2023-04-13 18:43:49 +03:00
6ad3faf4ae Edited screenshot 2023-04-13 11:38:46 +03:00
7d2a6bfe26 Hide 'two-factor authentication with SMS', update Integration.png 2023-04-12 13:24:36 +03:00
55ead8325b Remove unused services, text fixes, update screens 2023-04-10 19:16:26 +03:00
88f8638f77 Fix EditingProfiles.ascx, EditingProfiles.png 2023-04-07 17:09:12 +03:00
7d7ead8d70 Update screens (Collaborator -> Power user) 2023-03-29 12:50:06 +03:00
86e4db5804 Merge branch 'feature/drupal' into release/1.11.0 2023-03-28 11:07:13 +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
c98ec0e08d Fixes for DocSpace articles 2023-03-22 17:58:47 +03:00
trovier
0edf0397e7 Added screenshots for EN. 2023-03-21 15:48:23 +01:00
c10072e9fb Update ManagingRooms.ascx 2023-03-20 16:56:18 +03:00
e6969a67c3 Fixes for room types 2023-03-20 15:37:58 +03:00
b795d1e751 Update DocSpace articles 2023-03-14 16:00:39 +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
5f92087db8 Move missing files and changes from old Mattermost branch 2023-02-21 16:14:20 +03:00
2f5cf2e5ce Update Sharing Settings screens, minor text fixes 2023-02-10 15:20:16 +03:00
ca07580d90 Update DocSpace articles 2023-02-03 15:57:56 +03:00
48edd2dcd8 Merge branch 'feature/build_7.3' into release/1.9.0
# Conflicts:
#	Web/Controls/Help/Server/Document/DSChangelog.ascx
#	Web/Controls/Help/Server/Document/DSChangelog.ru.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/HelpfulHints/Navigation.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/HelpfulHints/Password.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/ProgramInterface/ProgramInterface.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/UsageInstructions/InsertCharts.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/UsageInstructions/InsertEquation.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/UsageInstructions/SupportSmartArt.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/HelpfulHints/Navigation.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/UsageInstructions/InsertCharts.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/UsageInstructions/InsertEquation.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/UsageInstructions/InsertText.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/UsageInstructions/SupportSmartArt.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/HelpfulHints/Navigation.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/HelpfulHints/Password.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/ProgramInterface/DataTab.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/CopyPasteData.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/InsertArrayFormulas.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/InsertChart.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/InsertEquation.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/InsertFunction.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/SupportSmartArt.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm
2023-01-31 11:28:22 +03:00
3a081eb1a5 Update Getting Started - Desktop 2023-01-27 18:34:26 +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
a37c8232f8 Update screens and minor text fixes for desktop editors. Update versions 2023-01-23 17:00:02 +03:00
e1cf298bd7 Start adding new articles for DocSpace 2023-01-20 12:40:06 +03:00
34edd26c06 Updates for memory quota 2023-01-11 10:39:30 +03:00
ea2cc5cafd Updates for Documents module 2022-12-16 16:18:21 +03:00
850a362bf5 Merge branch 'feature/redmine' into develop 2022-12-14 12:43:07 +03:00
2e8b8fcfb6 Updates for v12.5 (impersonation, dark theme, branding, password length) 2022-12-13 16:27:21 +03:00
36894702cf Update Redmine article 2022-11-30 18:41:52 +03:00
87b805ab47 Update Configuration.ascx and several articles 2022-11-21 18:15:38 +03:00
b5172abb11 Update Jira article 2022-11-17 17:54:13 +03:00
2ce5242216 Merge branch 'feature/plone' into develop
# Conflicts:
#	Web/Controls/Help/GettingStarted/Integration/Nextcloud/GettingStartedNextcloud.de.ascx
2022-11-14 13:09:12 +03:00
d163264fad Merge branch 'feature/moodle_2.2.0' into develop 2022-11-14 13:05:48 +03:00
66ab2cdfe2 Add Download as description 2022-10-13 13:28:14 +03:00
378400ae39 Update Plone article 2022-10-12 17:24:18 +03:00
trovier
01e3a05924 Updated icon. 2022-10-12 16:45:56 +03:00
0ee4c7750b Update screenshots for Desktop GettingStarted 2022-09-22 09:47:02 +03:00
8f603bb50c Add icon - Desktop/small/save_icon.png 2022-09-21 16:38:08 +03:00
7a547a67e6 Fixes as per testing. 2022-09-02 18:27:41 +03:00