Commit Graph

144 Commits

Author SHA1 Message Date
trovier
0c26495a59 Fixes for edition display, removed two lines (MsSQL, Oracle) in Resource.resx 2024-03-19 15:59:39 +01:00
trovier
3b5e1bdec5 Uploaded mssql, oracle db; removed postgresql 2024-03-14 15:21:41 +01:00
trovier
dbd41154bb Uploaded Dameng, PostgresQL articles. 2024-03-12 17:53:33 +01:00
207276aa03 Update articles about desktop editors 2023-12-28 18:38:07 +03:00
6485730b0a moved the instructions to the DocSpace section 2023-11-21 15:33:26 +03:00
491ee30918 added the services and tables pages for Workspace 2023-11-17 17:01:32 +03:00
9cc412b4d9 Merge branch 'feature/DocSpace-https' into release/1.16.0 2023-09-27 11:48:47 +03:00
5c1b461025 Merge branch 'feature/DocSpace-Windows-version' into release/1.16.0 2023-09-27 10:51:36 +03:00
bfad269e32 Add new articles about switching DocSpace to HTTPS 2023-09-25 11:26:01 +03:00
5ed8bbfbb0 Revert "Remove Windows articles for DocSpace"
This reverts commit a2d41b83be.
2023-09-11 18:36:06 +03:00
64f6ab4dd2 Add new article "Installing ONLYOFFICE Docs for Docker on KylinOS" 2023-08-03 16:07:45 +03:00
0f2bba30c4 Fixed menu and controls 2023-07-28 12:36:20 +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
a2d41b83be Remove Windows articles for DocSpace 2023-07-27 13:06:30 +03:00
48d5f6d543 Fix changelog again 2023-07-19 16:32:01 +03:00
361befe4e6 Add links 2023-07-19 11:53:32 +03:00
21e1f348a4 Fix docspace changelog 2023-07-19 11:01:01 +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
2ee3e5e96d Update DocSpaceChangelog.ascx 2023-07-18 18:58:53 +03:00
c2b0897dee Merge branch 'feature/docs-ipfilter' into release/1.13.0 2023-06-09 18:36:25 +03:00
bd312f47aa Add article DocSpaceWindows.ascx and fixes 2023-06-08 17:35:42 +03:00
bc7fe56359 Add new article DocSpaceScriptParameters.ascx 2023-06-05 19:04:06 +03:00
26ec6c0bc4 Start adding DocSpace installation articles 2023-06-01 15:48:11 +03:00
4c1dfb42da Remove article about Workspace Cloud registration 2023-05-31 18:25:28 +03:00
2afa3aa1ad Add new article docs-configure-ipfilter.aspx 2023-05-16 18:40:03 +03:00
a3986844bd Edit controls in ArticlesCompleteList and .resx files for Installation -> Desktop section 2023-02-13 12:53:58 +03:00
abe732a8cc Add Deploying ONLYOFFICE Docs in Linode article 2023-02-09 23:29:52 +03:00
c5e162c552 Merge branch 'feature/build_7.3' into release/1.9.0 2023-01-31 17:56:54 +03:00
44c8fe5562 Fixes for 2 unavailable video (hidden on YouTube) - updated 1st, hidden 2nd 2023-01-31 17:55:48 +03:00
abb963cd46 Add new article, new section and fixes for Docs Cloud 2022-11-23 15:44:04 +03:00
c96fa6ef10 Add docs-community-https-windows.aspx 2022-10-25 14:33:21 +03:00
123f2e73ca Add Ru translation to Configuring JWT article, update tags, minor fixes 2022-09-13 18:14:17 +03:00
c5ab0490c2 Build 7.2: fixes for iOS Documents, minor fixes for editors, JWT as a standalone article (EN+DE). 2022-08-29 18:23:09 +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
bc58f5d40d Add translations fr 2022-07-08 12:56:39 +03:00
e131a26cc3 Restore title for desktop-install-flatpak.aspx 2022-05-27 16:38:01 +03:00
8d71664100 Merge branch 'feature/helpcenter_12.0-for-release' into release/1.4.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/Controls/Help/HelpCenter.de.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.it.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.ru.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ToolsAndSettings/ToolsAndSettingsDocument.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ToolsAndSettings/ToolsAndSettingsDocument.it.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/OperationsOnObjects/PEOperationsOnObjects.de.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/OperationsOnObjects/PEOperationsOnObjects.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.de.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.it.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/SpreadsheetEditor/OperationsOnObjects/SEOperationsOnObjects.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/SpreadsheetEditor/OperationsOnObjects/SEOperationsOnObjects.it.ascx
#	Web/Controls/Help/VariousControls/LocalizeControls/SpreadsheetProtection/LocalizeSpreadsheetProtection.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Review.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/images/acceptreject_dropdown.png
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
2022-05-09 17:02:25 +03:00
c87b36fd38 Merge branch 'feature/build7.1-for-release' into release/1.4.0
# Conflicts:
#	Web/Controls/Help/Installation/DocsDeveloper.ascx
2022-05-09 15:22:16 +03:00
8188b72382 Merge branch 'feature/build7.1' into feature/build7.1-for-release
# Conflicts:
#	Web/Controls/Help/Installation/DocsCommunity.ascx
#	Web/Controls/Help/Installation/DocsDeveloper.ascx
#	Web/Controls/Help/Installation/DocsEnterprise.ascx
2022-05-06 11:41:22 +03:00
6e2b904ae0 Add page templates for Installing Docs Docker version for the 64-bit ARM 2022-05-06 11:24:32 +03:00
710a20adda Add articles - Installing Docs on CentOS for the 64-bit ARM 2022-05-06 10:40:37 +03:00
120fd88458 Add docs-connect-amazon.aspx 2022-04-29 15:45:54 +03:00
e7375bd37e Remove 'How to install Desktop Editors to Arch' article 2022-04-25 18:35:05 +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
226eeddf1a Merge branch 'feature/build7.1' into feature/build7.1-for-release
# Conflicts:
#	Web/Controls/Help/Installation/Docs.ascx
#	Web/Controls/Help/Installation/DocsCommunity.ascx
#	Web/Controls/Help/Installation/DocsDeveloper.ascx
#	Web/Controls/Help/Installation/DocsEnterprise.ascx
#	Web/Controls/Help/Installation/Installation.ascx
2022-04-15 15:29:03 +03:00
7f4fb86363 Add new articles - Installing ONLYOFFICE Docs on Debian systems for ARM 2022-04-11 14:50:59 +03:00
4b016334ac Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
c4f55eb453 Partial fixes for desktop-video-support.aspx 2022-03-31 19:19:58 +03:00
719c8909a4 Fix for workspace-saas-change-payment-plan.aspx 2022-03-31 16:27:16 +03:00