Commit Graph

43 Commits

Author SHA1 Message Date
9586cc46b3 Merge branch 'feature/docspace-wordpress' into develop
# Conflicts:
#	Web/Controls/Common/BaseHeader/BaseHeader.ascx
#	Web/Controls/Common/BaseHeader/BaseHeader.de.ascx
#	Web/Controls/Common/BaseHeader/BaseHeader.es.ascx
#	Web/Controls/Common/BaseHeader/BaseHeader.fr.ascx
#	Web/Controls/Common/BaseHeader/BaseHeader.it.ascx
#	Web/Controls/Common/BaseHeader/BaseHeader.ru.ascx
#	Web/Controls/Help/HelpCenter.ascx
#	Web/Controls/Help/HelpCenter.de.ascx
#	Web/Controls/Help/HelpCenter.es.ascx
#	Web/Controls/Help/HelpCenter.fr.ascx
#	Web/Controls/Help/HelpCenter.it.ascx
#	Web/Controls/Help/HelpCenter.ru.ascx
#	Web/Controls/Help/SideMenu/Integration/IntegrationMenu.ascx
#	Web/css/help.less
2024-03-22 15:47:08 +03:00
851caf9afa Add zoom article to menu 2024-03-14 17:53: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
trovier
fd35492c6c Initial commit (EN) 2023-11-08 12:08:37 +01:00
trovier
e7c9a5cf24 Initial commit (EN) 2023-10-26 19:59:39 +02:00
04faf2af34 Fix wordpress-docspace.aspx 2023-10-25 13:36:31 +03:00
24032aa0dc Add new article about docspace wordpress plugin 2023-10-24 16:09:22 +03:00
be7d526a4e Add Integration with Zoom GS article 2023-09-13 17:53:59 +03:00
trovier
9d413b15d5 Initial commit 2023-05-16 16:27:32 +02:00
trovier
e6893cce4d Initial commit (EN). 2023-03-16 16:03:04 +01:00
0da1eada3f Merge branch 'feature/mattermost-new' into release/1.10.0
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2023-03-06 18:04:40 +03:00
5f92087db8 Move missing files and changes from old Mattermost branch 2023-02-21 16:14:20 +03:00
a3986844bd Edit controls in ArticlesCompleteList and .resx files for Installation -> Desktop section 2023-02-13 12:53:58 +03:00
d23172252f Rename control 2022-11-23 15:55:48 +03:00
1c0b4aa46c Continue editing controls for Video.ascx 2022-07-29 17:53:56 +03:00
50d3a3f899 Merge branch 'feature/new_alfresco_wordpress' into release/1.5.0
# Conflicts:
#	Web/Controls/Common/BaseHeader/BaseHeader.ascx
#	Web/Controls/Help/GettingStarted/Integration/Alfresco/AlfrescoGettingStarted.ascx
#	Web/Controls/Help/GettingStarted/Integration/Alfresco/AlfrescoGettingStarted.de.ascx
#	Web/Controls/Help/Integration/Integration.ascx
#	Web/Controls/Help/SideMenu/Integration/IntegrationMenu.ascx
#	Web/Controls/Help/Video/Video.ascx
#	Web/css/help.less
2022-05-31 13:48:44 +03:00
3ac4bc7d62 Minor fixes. 2022-05-13 14:11:04 +03:00
b2cfc6aaaf New article for WordPress connector (EN only). 2022-05-12 15:06:49 +03:00
1900fd44cf Structure fix for new Strapi article 2022-04-13 10:02:54 +03:00
1bd72dbc15 Merge branch 'feature/strapi_connector' into feature/test-merge-for-release 2022-04-13 09:29:40 +03:00
f39f2f1c17 Initial commit. 2022-04-11 16:27:43 +03:00
28b4ccdcf7 Merge branch 'feature/moodle' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/HelpCenter.ascx
#	Web/Controls/Help/Integration/Integration.ascx
#	Web/Controls/Help/Video/Video.ascx
#	Web/css/help.less
2022-04-05 15:33:55 +03:00
6583397eb4 Try to fix groups-authorization-keys.aspx 2022-03-30 23:53:26 +03:00
4f53d682cf Try to fix docs-community-connect-groups-linux.aspx 2022-03-30 16:08:18 +03:00
daeb2f6bdc Finish editing local-server.ascx 2022-03-15 14:25:37 +03:00
c973db4c36 Add links in languages, fixes 2021-12-02 12:09:53 +03:00
7c98469ca1 Merge branch 'feature/jira' into hotfix/1.2.1
# Conflicts:
#	Web/Controls/Help/GettingStarted/Integration/Jira/GettingStartedJira.ascx
#	Web/Controls/Help/Tags/collaborative-editing/collaborative-editing.ascx
#	Web/Controls/Help/Tags/docker-version/docker-version.ascx
#	Web/Controls/Help/Tags/document-server/document-server.ascx
#	Web/Controls/Help/Tags/install-onlyoffice/install-onlyoffice.ascx
#	Web/Controls/Help/Tags/linux-version/linux-version.ascx
#	Web/Controls/Help/Tags/local-server/local-server.ascx
#	Web/Controls/Help/Tags/open-source-version/open-source-version.ascx
#	Web/css/help.less
2021-12-02 11:50:57 +03:00
d3ec8b950c Update 2021-12-02 11:30:36 +03:00
fb37189472 Remove Mattermost page (restore later) 2021-11-25 10:36:02 +03:00
ca4b446a2d Rename Redmine
# Conflicts:
#	Web/Integration/gettingstarted-redmine.aspx
2021-11-24 19:10:15 +03:00
07ce38547f Rename Nuxeo 2021-11-24 19:09:36 +03:00
SvetlanaLisina
9ca1715c7e bugfix links 2021-11-24 19:03:33 +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
3c569d0e5e Merge branch 'feature/redmine' into release/1.2.0 2021-11-24 18:48:25 +03:00
5feb8f514d Add redmine article 2021-11-10 18:29:20 +03:00
e79a43eb96 Add moodle article 2021-10-26 18:00:23 +03:00
685d98297c Add translations (fr) - Chamilo, Confluence, Nuxeo, Liferay; remove 'outofdate' for integration pages 2021-10-22 10:45:38 +03:00
6fff7362b6 Update Confluence, Liferay, Nuxeo articles; Add Chamilo article; Add Nuxeo video 2021-09-20 14:58:20 +03:00
1a8945b51e Add new article: onlyoffice-jira connector 2021-09-20 12:32:00 +03:00
780274ee96 Fixed links to renamed 100017_connect_nextcloud.ascx in sitemap, abc index, web.config and integration pages 2021-02-11 15:27:42 +03:00
b07710c67e Minor fix 2021-01-12 19:07:29 +03:00
9759255cde Fixed header color for current section (UserGuides and Integration) 2021-01-12 14:55:21 +03:00
f285dd0fa4 Added Integration section and minor fixes 2020-10-09 18:30:41 +03:00