pavelbannov
3e6a417d19
# Conflicts: # common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs # migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs # packages/client/src/components/panels/SelectFileDialog/index.js # packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js # packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js # packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js # packages/client/src/store/ProfileActionsStore.js # packages/common/api/files/index.js # packages/common/store/AuthStore.js # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # yarn.lock |
||
---|---|---|
.. | ||
ASC.ActiveDirectory | ||
ASC.Api.Core | ||
ASC.Common | ||
ASC.Core.Common | ||
ASC.Data.Backup.Core | ||
ASC.Data.Encryption | ||
ASC.Data.Reassigns | ||
ASC.Data.Storage | ||
ASC.EventBus | ||
ASC.EventBus.ActiveMQ | ||
ASC.EventBus.Extensions.Logger | ||
ASC.EventBus.RabbitMQ | ||
ASC.FederatedLogin | ||
ASC.Feed | ||
ASC.IPSecurity | ||
ASC.MessagingSystem | ||
ASC.Migration | ||
ASC.Notify.Textile | ||
ASC.Resource.Manager | ||
ASC.Socket.IO | ||
ASC.SsoAuth | ||
ASC.Textile | ||
ASC.Thumbnails | ||
ASC.WebDav | ||
ASC.Webhooks.Core | ||
ASC.WebPlugins | ||
services | ||
Tests | ||
Tools |