Commit Graph

81 Commits

Author SHA1 Message Date
trovier
3603636ac7 Basics finished: articles, controls, indexes, pictures 2023-09-25 17:33:15 +02: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
26ec6c0bc4 Start adding DocSpace installation articles 2023-06-01 15:48:11 +03:00
trovier
9d413b15d5 Initial commit 2023-05-16 16:27:32 +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
trovier
8304c490bb Header changes, CSS changes, Help/HelpCenter.ascx changes (all languages). 2023-03-16 16:05:07 +01:00
5f92087db8 Move missing files and changes from old Mattermost branch 2023-02-21 16:14:20 +03:00
17989db513 Add DocSpace pages to menu 2023-02-09 18:15:02 +03:00
abb963cd46 Add new article, new section and fixes for Docs Cloud 2022-11-23 15:44:04 +03:00
f230a4670c Merge branch 'feature/contribution_rework' into release/1.6.0 2022-07-28 15:05:44 +03:00
c1873a4cdd English is complete. 2022-07-01 16:19:52 +03:00
4d0fd20a49 Header menu reworked (EN+DE). 2022-07-01 13:54:32 +03:00
654426af32 Continue updating sitemaps 2022-06-10 18:31:32 +03:00
869bfe603e Continue editing sitemaps and structure fixes 2022-06-08 18:35:08 +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
b2cfc6aaaf New article for WordPress connector (EN only). 2022-05-12 15:06:49 +03:00
b6d215af76 Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release
# Conflicts:
#	Web/Controls/Help/Administration/Administration.de.ascx
#	Web/Controls/Help/Administration/ControlPanel.de.ascx
2022-04-21 09:14:00 +03:00
d691ecc6d8 Feed tool: main page, header + German. AuthorizationKeys.de.ascx fixes. ControlPanel.de.ascx fixes. 2022-04-20 17:40:51 +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
dfb9965ae6 Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/Tags/collaborative-editing/collaborative-editing.ascx
2022-03-17 16:04:18 +03:00
9806e697fa Rename controls 2022-02-15 17:04:43 +03:00
dc9a9bfd94 Add ONLYOFFICE Personal section 2022-02-01 13:52:38 +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
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
9321d8562d фикс прекомпиляции хелпцентра 2021-11-24 18:51:05 +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
87494b430d Merge branch 'feature/mob_projects_android' into release/1.0.0 2021-10-07 19:02:25 +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
b6dfb6e86d Added new masters, index page, side menu, add new pages to lists 2021-07-20 13:16:36 +03:00
SvetlanaLisina
f9d8d1876c changed mobile button on header and footer, fixed closed-button, fixed popup 2021-05-11 17:48:05 +03:00
dac2fda541 Updated links in BaseHeader.ascx (document editors) 2021-03-10 15:10:55 +03:00
SvetlanaLisina
ede3c7780d bugfix 2020-12-28 18:17:26 +03:00
SvetlanaLisina
c0986d041b changed style, bugfix and added language-selector on footer 2020-12-08 18:23:12 +03:00
c866420565 Renamed ONLYOFFICE Workspace Control Panel into ONLYOFFICE Control Panel, removed "ONLYOFFICE Workspace" from tags for Control Panel articles 2020-12-02 11:36:22 +03:00
7116c00174 Fixed uniformity of menu items 2020-11-10 17:58:25 +03:00
SvetlanaLisina
3a8a2edb7e Fixed links in Integration Guides 2020-11-03 18:01:58 +03:00
d99681ea3b Added Control Panel menu item into Administration section 2020-11-02 18:09:36 +03:00
8a519662e1 Fixed Development menu item 2020-11-02 17:06:31 +03:00
f39e3be4fc Added navigation links for Administration section, changed Cloud and Desktop links 2020-11-02 15:50:14 +03:00
SvetlanaLisina
1dbb9dc10d bugfix and fix styles 2020-11-02 12:01:38 +03:00
SvetlanaLisina
56bad13b16 Fixed bug in the header 2020-11-02 11:59:47 +03:00
SvetlanaLisina
cb22dd8f2d bugfix main page 2020-11-02 11:59:19 +03:00
SvetlanaLisina
1b69160b83 fixed header and added navigation links 2020-11-02 11:58:00 +03:00
SvetlanaLisina
63e304178e added translate footer & header, fixed header
# Conflicts:
#	Web/Controls/Common/BaseFooter/BaseFooter.es.ascx
#	Web/Controls/Common/BaseFooter/BaseFooter.fr.ascx
#	Web/Controls/Common/BaseFooter/BaseFooter.it.ascx
#	Web/Controls/Common/BaseFooter/BaseFooter.ru.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
2020-11-02 11:56:59 +03:00
b5d78e82a4 Restored bugfix changes 2020-10-15 12:08:12 +03:00
a1a3ddb106 Revert "bugfix"
This reverts commit 000e4533a7.
2020-10-14 19:45:07 +03:00