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
..
Context	Merge branch 'hotfix/v1.1.2' into develop	2023-08-28 18:53:10 +03:00
Model	Merge branch 'hotfix/v1.1.2' into develop	2023-09-01 15:33:39 +03:00
Teamlabsite	add migration to Teamlabsite	2022-12-19 18:01:57 +03:00
CreatorDbContext.cs	fix key	2022-12-23 13:27:49 +03:00
CustomSqlGenerator.cs	merge from release/rc-v1.2.0. fixed problem and update dll	2023-01-19 15:47:09 +03:00
DbFunctionsExtension.cs	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
FireBaseUser.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
LinqExtensions.cs	added new license headers	2022-03-15 21:00:53 +03:00
PredicateBuilder.cs	People: filter by employeeTypes	2023-07-12 13:10:47 +03:00