pavelbannov 3e6a417d19 Merge branch 'hotfix/v1.1.2' into develop ... # 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		2023-09-01 15:33:39 +03:00
..
Api	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ApiModels	fixed quotes	2023-04-26 18:02:22 +03:00
Extensions	nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property	2022-09-15 17:44:04 +03:00
Properties	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
appsettings.json	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
ASC.Data.Backup.csproj	Hide documentation warnings	2023-04-05 20:41:04 +05:00
GlobalUsings.cs	fix	2023-08-28 12:03:33 +03:00
Program.cs	fixed ArgumentOutOfRangeException	2023-08-04 17:42:14 +03:00
Startup.cs	fix local restore	2022-10-06 15:51:15 +03:00