Commit Graph

4705 Commits

Author SHA1 Message Date
a099621110 Merge remote-tracking branch 'remotes/origin/feature/docs-ansible' into feature/test-fixes-december-23
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2023-12-06 12:32:42 +03:00
75e09a7edb Merge branch 'feature/system-requirements' into feature/test-fixes-december-23 2023-12-06 12:30:29 +03:00
c1f8f04951 Display documentation about editors on test-helpcenter (for test only) 2023-12-06 12:30:06 +03:00
d66f3fb7b9 Merge branch 'develop' of https://github.com/ONLYOFFICE/helpcenter into develop 2023-12-06 11:32:26 +03:00
a6617e53c2 Merge remote-tracking branch 'remotes/origin/feature/rewrite_rules_for_integration' into release/1.18.0 2023-12-04 13:44:08 +03:00
1b18b338f8 Merge branch 'feature/DocSpace-2.0' into release/1.18.0 2023-12-04 12:51:29 +03:00
78f5f43e99 Fix Zoom description 2023-12-04 12:28:04 +03:00
4c2bfdd71e Update Changelog.md 2023-12-04 11:38:44 +03:00
76c262f405 Edit menu in languages 2023-12-04 11:37:45 +03:00
trovier
1e72802eb3 Images for the article 2023-12-04 11:24:16 +03:00
trovier
f186d5cb99 Initial commit (EN)
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
#	Web/Controls/Help/HelpCenter.ascx
#	Web/Controls/Help/SideMenu/Integration/IntegrationMenu.ascx
2023-12-04 11:23:56 +03:00
5b647ffe33 Update Changelog.md 2023-12-04 10:34:42 +03:00
22e21e05a1 Merge branch 'feature/DocSpace-2.0' into release/1.18.0 2023-12-04 10:25:19 +03:00
c7573aca8f Merge remote-tracking branch 'remotes/origin/feature/workspace-general-configuration' into release/1.18.0 2023-12-04 10:24:33 +03:00
0f735191d2 Merge branch 'feature/structure-fix' into release/1.18.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
2023-12-04 10:23:13 +03:00
78658988e9 Fix DocSpace Changelog 2023-12-04 10:18:59 +03:00
c3e7032cf0 Fix DocSpace articles 2023-12-01 15:40:23 +03:00
6fcc871a0c FIX rewrite rules order 2023-11-30 08:51:28 +03:00
debd6e01c0
Merge pull request #62 from ONLYOFFICE/feature/rewrite_rules_for_integration
Feature/rewrite rules for integration
2023-11-29 16:15:56 +03:00
890c3a5a15 ADD rewrite rules for integration 2023-11-29 16:11:44 +03:00
dbcecf5871 ADD rewrite rules for integration 2023-11-29 16:09:36 +03:00
43d3be81c7
Merge pull request #61 from ONLYOFFICE/feature/workspace-general-configuration
Remove WebhookService
2023-11-28 16:34:38 +03:00
56b9cac3bd removed one more service 2023-11-28 16:00:18 +03:00
8dcf7aadac
Merge pull request #60 from ONLYOFFICE/feature/workspace-general-configuration
Remove services
2023-11-27 13:07:43 +03:00
bf63cc6350 removed services 2023-11-27 12:57:23 +03:00
fcd4fdfb6c Update system requirements for RHEL, CentOS 2023-11-27 12:49:36 +03:00
2806c71de3 Merge branch 'feature/suitecrm' into release/1.18.0 2023-11-23 13:13:35 +03:00
c801c0b665 Update Changelog.md 2023-11-23 13:07:47 +03:00
cee207849d Merge branch 'feature/rework-function-pages' into release/1.18.0 2023-11-23 13:02:19 +03:00
3e402307ec Update DEChangelog.ascx, Changelog.md 2023-11-23 12:31:12 +03:00
de7cf43b0c Edit menu for new connectors in languages 2023-11-23 12:19:11 +03:00
f0c5b6e9d2 Merge branch 'feature/fix-AWS-guide' into release/1.18.0 2023-11-23 11:35:32 +03:00
e654781725 Fix skew 2023-11-23 11:13:39 +03:00
01984ab535 Edit ManagingDocuments.ascx 2023-11-22 18:16:53 +03:00
trovier
a749651654 Minor fix for Pipedrive 2023-11-22 15:52:13 +01:00
5679dbb0c7 Fix DocSpace pages 2023-11-22 14:24:53 +03:00
d7caba7eb3 Fix AWS guide 2023-11-22 14:07:10 +03:00
534d35333a Fix sortby.htm 2023-11-22 14:02:14 +03:00
21218b73f9 Merge branch 'master' into feature/rework-function-pages
# Conflicts:
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/Functions/address.htm
2023-11-22 13:58:59 +03:00
4c4db8df4b Fix function pages 2023-11-22 13:50:27 +03:00
adf0df93a9 Fixes for statistical-functions.ascx 2023-11-21 18:56:35 +03:00
c509e24bb9
Merge pull request #59 from ONLYOFFICE/feature/workspace-general-configuration
DocSpace instructions
2023-11-21 16:25:29 +03:00
4f69ff276b Fix Dropbox instructions 2023-11-21 16:24:53 +03:00
c3d16dc6fb Fixes for statistical-functions.ascx 2023-11-21 15:51:16 +03:00
6485730b0a moved the instructions to the DocSpace section 2023-11-21 15:33:26 +03:00
97356286b6 Merge branch 'feature/ios7.5' into release/1.18.0
# Conflicts:
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/OperationsOnObjects/AdjustChartSettings/AdjustChartSettings.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/OperationsOnObjects/ChangeTextWrapping/ChangeTextWrapping.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/OperationsOnObjects/InsertAutoshapes/InsertAutoshapes.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/OperationsOnObjects/InsertImages/InsertImages.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/OperationsOnObjects/InsertTables/InsertTables.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/OperationsOnObjects/ManipulateObjects/ManipulateObjects.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/PageFormatting/InsertPageBreaks/InsertPageBreaks.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/PageFormatting/InsertPageNumbers/InsertPageNumbers.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/PageFormatting/InsertSectionBreaks/InsertSectionBreaks.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/PageFormatting/SetPageParameters/SetPageParameters.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/ParagraphFormatting/InsertLineBreaks/InsertLineBreaks.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PEOperationsOnObjects/PECreateCharts/PECreateCharts.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PEOperationsOnObjects/PEInsertAutoshapes/PEInsertAutoshapes.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PEOperationsOnObjects/PEInsertImages/PEInsertImages.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PEOperationsOnObjects/PEInsertTables/PEInsertTables.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PEOperationsOnObjects/PEManipulateObjects/PEManipulateObjects.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PETextFormatting/PEInsertText/PEInsertText.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/EditingCellProperties/SEAlignData/SEAlignData.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/OperationsOnObjects/InsertFormulas/InsertFormulas.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/OperationsOnObjects/SEInsertAutoshapes/SEInsertAutoshapes.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/OperationsOnObjects/SEInsertCharts/SEInsertCharts.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/OperationsOnObjects/SEInsertImages/SEInsertImages.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/OperationsOnObjects/SEManipulateObjects/SEManipulateObjects.fr.ascx
2023-11-20 11:48:02 +03:00
d00b619103
Merge pull request #58 from ONLYOFFICE/feature/workspace-general-configuration
Workspace services and SQL tables
2023-11-17 18:09:07 +03:00
763c02c00c Partial fixes for statistical-functions.ascx 2023-11-17 18:03:36 +03:00
491ee30918 added the services and tables pages for Workspace 2023-11-17 17:01:32 +03:00
AlyonaYar
e09faae8cf Formatting fixes 2023-11-17 11:38:39 +03:00