Commit Graph

2586 Commits

Author SHA1 Message Date
26f2ad7c19 Fix GettingStarted/Integration/Nuxeo.aspx 2021-12-02 10:52:42 +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
91a53e4eb2 Fix Humhub.fr.ascx 2021-11-19 17:42:10 +03:00
3997ed5ec1 Fix misprints 2021-11-19 11:54:08 +03:00
b79110ab77 Add Redmine.fr.ascx 2021-11-18 16:48:19 +03:00
8d0d4c7fd1 Add Sharepoint.fr.ascx 2021-11-18 13:08:01 +03:00
6e97d97119 Fix Alfresco.fr.ascx 2021-11-18 11:21:19 +03:00
60a7b15e09 Remove second video from ConditionalFormatting.aspx 2021-11-15 18:32:10 +03:00
e5601c2c8a Add translations for index pages - fr 2021-11-12 18:35:12 +03:00
54969b90ec Add Plone.fr.ascx, Humhub.fr.ascx, update Alfresco.fr.ascx 2021-11-12 17:27:12 +03:00
63e88b6a66 Highlight chamilo in header 2021-11-12 14:40:02 +03:00
f3dd29f12a Highlight redmine in header 2021-11-12 14:32:28 +03:00
aee0042fcd Add conditional formatting pt2 video 2021-11-12 13:08:55 +03:00
c057d87326 Highlight redmine in left menu 2021-11-11 18:52:53 +03:00
aa3d920c40 Fix Liferay.fr.ascx 2021-11-11 18:48:14 +03:00
c37c73492d Fix Liferay.ascx and config image 2021-11-11 18:00:13 +03:00
fcc82d0d6b Update Integration.ascx; text fixes 2021-11-11 15:03:39 +03:00
b8b22d5f82 Fix Humhub.ascx 2021-11-11 14:47:24 +03:00
d63c9d170f Minor fix - port_list.fr.js 2021-11-11 12:48:35 +03:00
dc1f953061 Add new videos - SSO, HTML, Telegram notifications 2021-11-11 12:29:02 +03:00
82cf861f02 Add conditional formatting video 2021-11-10 19:03:36 +03:00
766f690643 Update images 2021-11-10 18:37:52 +03:00
5feb8f514d Add redmine article 2021-11-10 18:29:20 +03:00
d5b7546fe5 Minor text fix - Confluence.fr.ascx 2021-11-10 16:03:53 +03:00
88af56b85f Minor text fixes 2021-11-10 16:00:13 +03:00