Commit Graph

5 Commits

Author SHA1 Message Date
6583397eb4 Try to fix groups-authorization-keys.aspx 2022-03-30 23:53:26 +03:00
a102fff4fc Merge remote-tracking branch 'remotes/origin/feature/security' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/Tags/custom-domain-name/custom-domain-name.ascx
#	Web/Controls/Help/Tags/invite-people/invite-people.ascx
#	Web/Controls/Help/Tags/password-strength/password-strength.ascx
#	Web/Controls/Help/Tags/restore-backup/restore-backup.ascx
#	Web/Controls/Help/Tags/security/security.ascx
#	Web/Controls/Help/Tags/trusted-domains/trusted-domains.ascx
2022-03-18 13:30:18 +03:00
c7e046ecbc Remove Watchvideo.ascx because of using Resource.resx instead. 2022-03-02 17:06:43 +03:00
93e0c4d32a Add Workspace Enterprise Edition Security Guide 2022-02-18 15:49:26 +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