Commit Graph

765 Commits

Author SHA1 Message Date
f930c76cf3 Simplify 'Option 2' for the 'Running ONLYOFFICE Desktop Editors with parameters' article 2023-07-31 11:43:08 +03:00
6c44bcb6f6 Merge branch 'feature/linode' into release/1.14.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/Controls/Help/Tags/document-server/document-server.ascx
2023-07-27 13:45:58 +03:00
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
2f84d0300b Merge branch 'feature/build_7.4' into release/1.14.0 2023-07-20 14:08:28 +03:00
b14bafaca3 Merge branch 'feature/DocSpace-1.1.0' into release/1.14.0 2023-07-19 16:56:36 +03:00
84ec367d0d Fix images (fr, de) 2023-07-19 16:53:55 +03:00
0ddd507b25 Update screen + minor fixes 2023-07-19 16:23:59 +03:00
7acab4b290 Merge branch 'feature/docspace-install' into feature/DocSpace-1.1.0
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2023-07-19 10:54:02 +03:00
c9d85e1408 Fix screens 2023-07-19 10:47:36 +03:00
dd9b38caad New fixes (fr) 2023-07-19 08:46:58 +03:00
10610aede5 Merge branch 'feature/DocSpace-1.1.0' into release/1.14.0 2023-07-18 14:25:15 +03:00
b94607fc5f Merge branch 'feature/docspace-install' into release/1.14.0
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2023-07-18 14:24:44 +03:00
e96af023d3 Merge branch 'feature/ios7.4' into release/1.14.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
2023-07-18 14:19:00 +03:00
4817310129 Update screenshots 2023-07-13 18:04:02 +03:00
e106ad036f Add screens for GettingStarted.fr.ascx 2023-07-13 13:13:59 +03:00
aebc5ca448 Update screens (fr) 2023-07-12 17:49:08 +03:00
0fe2dc8fc5 Update DocSpace guides for v1.1.0 2023-07-12 16:26:05 +03:00
6701b3f0d8
Merge pull request #36 from ONLYOFFICE/feature/colors-description
Theme colors
2023-07-06 15:03:28 +03:00
fb0d25a4d8 Add screenshots (fr) 2023-07-04 12:31:32 +03:00
trovier
0168df0ecf German translation added, Changelog updated. 2023-06-30 14:56:20 +02:00
8f77d6cceb Add translations for v7.4 (fr), update indexes.js (fr, de) 2023-06-28 15:02:39 +03:00
trovier
be78f3c1b0 Initial commit 2023-06-23 12:38:53 +02:00
d6bd3e845f Merge branch 'feature/build_7.4' into release/1.13.0 2023-06-13 11:36:13 +03:00
6887ebe5a1 Fix DocSpaceWindows.ascx 2023-06-08 19:24:41 +03:00
bd312f47aa Add article DocSpaceWindows.ascx and fixes 2023-06-08 17:35:42 +03:00
74d3c8ac3f Edit DocSpaceCloudRegistration.ascx 2023-06-01 18:58:55 +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
34d27e139a Update mobile web android 2023-05-15 13:57:36 +03:00
trovier
8d1f358c79 Updated desktop interface screenshots 2023-05-10 14:55:48 +02:00
b0367250e9 Update screenshots in French. Edit DocSpaceSSODescription.ascx 2023-04-24 15:25:07 +03:00
a64318cb69 Add screenshots in French 2023-04-21 19:30:06 +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
trovier
24917a7436 German screenshots added 2023-04-20 17:14:37 +02: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
fe79e914c5 Add new video 2023-04-10 17:39:27 +03:00
88f8638f77 Fix EditingProfiles.ascx, EditingProfiles.png 2023-04-07 17:09:12 +03:00
19fde8d80e Merge branch 'develop' into feature/build_7.4 2023-03-30 11:28:15 +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
a95c47748c Merge remote-tracking branch 'remotes/origin/feature/ios_7.3' into release/1.11.0
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2023-03-24 15:48:22 +03:00
897feb691d Merge branch 'feature/android_v5.6' into release/1.11.0 2023-03-24 15:45:13 +03:00
c98ec0e08d Fixes for DocSpace articles 2023-03-22 17:58:47 +03:00