Commit Graph

2827 Commits

Author SHA1 Message Date
AlexandrKharitonov
0eed0e7d16 check the build result 2021-12-06 16:00:08 +03:00
AlexandrKharitonov
78efe3c451 add task deploy 2021-12-06 15:08:50 +03:00
8b1c8da7d1 Update Groups version 2021-12-06 13:59:57 +03:00
d5f7f273b0 Update CSChangelog.ascx 2021-12-06 13:58:00 +03:00
52e8f84082 Merge branch 'feature/compatibility-table-11.6' into feature/workspace-11.6
# Conflicts:
#	Web/Controls/Help/Server/Common/DocumentConnection/ServerCompatibility/ServerCompatibility.ascx
#	Web/Controls/Help/Server/Common/DocumentConnection/ServerCompatibility/ServerCompatibility.ru.ascx
2021-12-06 12:27:12 +03:00
0a1f4b1e68 Merge branch 'feature/custom_theme' into feature/docs-7.0 2021-12-06 12:06:08 +03:00
0a9c247316 Update DSChangelog.ascx 2021-12-06 12:05:43 +03:00
ea82dc6eca Add tags for new pages 2021-12-06 10:59:57 +03:00
481cbd1cd5 Add new and update existing articles for 7.0 2021-12-03 18:18:12 +03:00
933ea7cc5c Alfresco German translation. 2021-12-03 14:46:07 +03:00
0cd13edae8 Rename Master form to Form template, some fixes 2021-12-03 14:14:35 +03:00
1f708dd8c8 Update changelog.md 2021-12-02 12:12:56 +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
26f2ad7c19 Fix GettingStarted/Integration/Nuxeo.aspx 2021-12-02 10:52:42 +03:00
ebcfed9a1e German translation. 2021-12-01 18:10:22 +03:00
2a7ff597e7 Update articles 2021-11-30 14:54:58 +03:00
1d8deb3700 Updates and fixes 2021-11-29 16:38:40 +03:00
e87510acc7 Some fixes 2021-11-26 12:16:29 +03:00
50c450362d Rename white-labeling and workspace 2021-11-25 19:03:09 +03:00
f80fe008d8 Some fixes 2021-11-25 16:12:18 +03:00
eb972c9482 Add Redmine to BaseHeader.fr.ascx and HelpCenter.fr.ascx 2021-11-25 13:45:04 +03:00
bfa3d87587 Update Changelog.md 2021-11-25 11:04:53 +03:00
fb37189472 Remove Mattermost page (restore later) 2021-11-25 10:36:02 +03:00
5d52e36aa8 Merge branch 'feature/communication_plugins' into release/1.2.0
# Conflicts:
#	Changelog.md
2021-11-24 19:51:08 +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
48112ac26d Update PEMainMenu.de.ascx 2021-11-24 19:09:03 +03:00
efe2bcbece Update New FR controls from different connector branches
# Conflicts:
#	Web/Controls/Help/GettingStarted/Integration/Jira/GettingStartedJira.fr.ascx
2021-11-24 19:08:41 +03:00
d0122ba7da Update New FR controls from feature/translations-fr-part3 2021-11-24 19:05:05 +03:00
SvetlanaLisina
9ca1715c7e bugfix links 2021-11-24 19:03:33 +03:00
SvetlanaLisina
e34e5cf40e bugfix 2021-11-24 19:03:17 +03:00
SvetlanaLisina
2e91699feb fix integration 2021-11-24 19:02:42 +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
ebf4811fe8 targetFramework 4.8
поправлен виртуальный каталог
Поправлен путь к BaseFooter
2021-11-24 18:50:50 +03:00
08bf704e5c Update publish.proj 2021-11-24 18:50:36 +03:00
fd4d4b2e3e Change BasePage.cs 2021-11-24 18:50:24 +03:00
a28b00107c Merge branch 'feature/yandex' into release/1.2.0 2021-11-24 18:49:02 +03:00
3c569d0e5e Merge branch 'feature/redmine' into release/1.2.0 2021-11-24 18:48:25 +03:00
3274f39721 Merge branch 'feature/plone-humhub' into release/1.2.0 2021-11-24 18:47:58 +03:00
c0b073fe1c Merge branch 'feature/onelogin' into release/1.2.0 2021-11-24 18:47:28 +03:00
6ad4bf2995 Merge branch 'feature/translations-fr-part3' into release/1.2.0 2021-11-24 18:46:25 +03:00
03747acf32 Merge branch 'feature/add-video' into release/1.2.0 2021-11-24 18:24:17 +03:00
40e9148394 Add Jira.fr.ascx 2021-11-24 08:29:34 +03:00
894bff0f80 Update DS version 2021-11-23 17:13:21 +03:00
4b506cb82b Fix ChangeThemes.ascx 2021-11-23 17:05:34 +03:00
3a18b02881 Update ShareDocuments.ascx 2021-11-23 16:47:04 +03:00
fa25b90e46 Update Getting Started - Documents 2021-11-23 13:06:41 +03:00