IlyaSobolev/helpcenter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 27 Wiki Activity
1dc034de40
helpcenter/Web/Controls/Help/Administration
History
svetlana maleeva 1dc034de40 Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 
# Conflicts:
#	Web/Controls/Help/Administration/Administration.ascx
#	Web/Controls/Help/Administration/ControlPanel.ascx
#	Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.ascx
#	Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.de.ascx
#	Web/Controls/Help/ArticlesCompleteList/Guides/151_share_text/151_share_text.ascx
#	Web/Controls/Help/ArticlesCompleteList/ONLYOFFICEEditors/2021_using-chat.ascx
#	Web/Controls/Help/ArticlesCompleteList/TipsTricks/130_folder_permissions/130_folder_permissions.ascx
#	Web/Controls/Help/Desktop/Documents/Common/PrivateRoom/PrivateRoom.de.ascx
#	Web/Controls/Help/GettingStarted/Projects/GettingStartedProjects.de.ascx
#	Web/Controls/Help/Guides/Documents/ShareDocuments/ShareDocuments.ascx
#	Web/Controls/Help/ONLYOFFICEEditors/EditorsUserGuides/EditorsUserGuides.ascx
#	Web/Controls/Help/Tags/generate-report/generate-report.ascx
#	Web/Controls/Help/Tags/generate-report/generate-report.de.ascx
#	Web/Controls/Help/Tags/manage-access-rights/manage-access-rights.ascx
#	Web/Controls/Help/Tags/onlyoffice-people/onlyoffice-people.ascx
#	Web/Controls/Help/Tags/onlyoffice-people/onlyoffice-people.de.ascx
#	Web/Controls/Help/Tags/onlyoffice-projects/onlyoffice-projects.ascx
#	Web/Controls/Help/Tags/onlyoffice-projects/onlyoffice-projects.de.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.de.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.es.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.fr.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.it.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.ru.ascx
#	Web/Controls/Help/Tags/report-templates/report-templates.ascx
#	Web/Controls/Help/Tags/report-templates/report-templates.de.ascx
#	Web/Controls/Help/Tags/security/security.ascx
#	Web/Controls/Help/Tags/security/security.de.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.de.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.es.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.fr.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.it.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.ru.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.de.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.fr.ascx
#	Web/Controls/Help/UserGuides/DocsUserGuides.ascx
#	Web/Controls/Help/UserGuides/DocsUserGuides.de.ascx
#	Web/Controls/Help/UserGuides/DocsUserGuides.fr.ascx
#	Web/Controls/Help/UserGuides/DocsUserGuides.ru.ascx
#	Web/Controls/Help/UserGuides/Groups.ascx
#	Web/Controls/Help/UserGuides/Groups.de.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.ascx
#	Web/Controls/Help/UserGuides/GroupsMail.de.ascx
#	Web/Controls/Help/UserGuides/GroupsProjects.ascx
#	Web/Controls/Help/UserGuides/GroupsProjects.de.ascx
#	Web/Controls/Help/UserGuides/UserGuides.ascx
#	Web/ONLYOFFICE-Editors/Editors-User-Guides/DocumentEditor/Add-watermark.aspx
#	Web/ONLYOFFICE-Editors/Editors-User-Guides/SpreadsheetEditor/Merge-and-unmerge-cells.aspx
#	Web/ONLYOFFICE-Editors/Editors-User-Guides/SpreadsheetEditor/Merge-cells.aspx
2022-04-20 16:11:30 +03:00
..
Administration.ascx Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 2022-04-20 16:11:30 +03:00
Administration.de.ascx Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 2022-04-20 16:11:30 +03:00
Administration.ru.ascx Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 2022-04-20 16:11:30 +03:00
AdminSecurity.ascx Try to fix groups-authorization-keys.aspx 2022-03-30 23:53:26 +03:00
AdminSecurity.de.ascx Try to fix groups-authorization-keys.aspx 2022-03-30 23:53:26 +03:00
AdminSecurity.ru.ascx Try to fix groups-authorization-keys.aspx 2022-03-30 23:53:26 +03:00
ConfiguringModules.ascx Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 2022-04-20 16:11:30 +03:00
ConfiguringModules.de.ascx Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 2022-04-20 16:11:30 +03:00
ConfiguringModules.ru.ascx Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 2022-04-20 16:11:30 +03:00
ControlPanel.ascx Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 2022-04-20 16:11:30 +03:00
ControlPanel.de.ascx Finish editing local-server.ascx 2022-03-15 14:25:37 +03:00
ControlPanel.ru.ascx Finish editing local-server.ascx 2022-03-15 14:25:37 +03:00
CustomizingModules.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
CustomizingModules.de.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
CustomizingModules.ru.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
ExternalServices.ascx Try to fix groups-authorization-keys.aspx 2022-03-30 23:53:26 +03:00
ExternalServices.de.ascx Try to fix groups-authorization-keys.aspx 2022-03-30 23:53:26 +03:00
ExternalServices.ru.ascx Try to fix groups-authorization-keys.aspx 2022-03-30 23:53:26 +03:00
ManagingUsers.ascx Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 2022-04-20 16:11:30 +03:00
ManagingUsers.de.ascx Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 2022-04-20 16:11:30 +03:00
ManagingUsers.ru.ascx Try to fix administration/control-panel-ldap.aspx 2022-03-29 17:25:47 +03:00
PortalManagement.ascx Remove Watchvideo.ascx because of using Resource.resx instead. 2022-03-02 17:06:43 +03:00