pavelbannov
bc6b0d9e0d
# Conflicts: # common/ASC.Core.Common/ASC.Core.Common.csproj # common/ASC.Core.Common/Billing/ITariffService.cs # common/ASC.Core.Common/Billing/TariffService.cs # common/ASC.Core.Common/Data/DbTenantService.cs # common/ASC.Core.Common/Notify/EmailSenderSink.cs # common/ASC.Core.Common/Notify/JabberSenderSink.cs # common/ASC.Core.Common/Notify/PushSenderSink.cs # common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs # common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs # common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj # migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs # migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs # migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs # migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs # migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs # migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs # migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs # migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs # migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs # migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs # migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs # migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs # migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs # migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs # packages/client/src/helpers/constants.js # packages/client/src/pages/Files.jsx # packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js # packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/index.js # packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js # packages/client/src/pages/PortalSettings/categories/developer-tools/index.js # packages/client/src/pages/PortalSettings/categories/integration/index.js # packages/client/src/pages/PortalSettings/categories/security/index.js # packages/client/src/pages/Profile/Section/Header/index.js # packages/common/store/SettingsStore.js # packages/components/drop-down/index.js # products/ASC.Files/Core/Core/Security/FileSecurity.cs # products/ASC.Files/Server/Api/FoldersController.cs # products/ASC.Files/Server/Api/SecurityController.cs # products/ASC.Files/Server/Api/SettingsController.cs # products/ASC.Files/Server/Api/TagsController.cs # products/ASC.People/Server/Api/ThirdpartyController.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/FeedController.cs # web/ASC.Web.Api/Api/PaymentsController.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/SecurityController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # web/ASC.Web.Api/Core/DnsSettings.cs # web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs # web/ASC.Web.Api/GlobalUsings.cs # web/ASC.Web.Core/CookiesManager.cs # web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs # yarn.lock |
||
|---|---|---|
| .. | ||
| AccountLoginType.cs | ||
| AzRecord.cs | ||
| DBResourceManager.cs | ||
| EmployeeActivationStatus.cs | ||
| EmployeeStatus.cs | ||
| EmployeeType.cs | ||
| Group.cs | ||
| GroupInfo.cs | ||
| IAzService.cs | ||
| IncludeType.cs | ||
| IQuotaService.cs | ||
| ISubscriptionService.cs | ||
| ITenantService.cs | ||
| IUserService.cs | ||
| Payments.cs | ||
| RegionHelper.cs | ||
| SubscriptionMethod.cs | ||
| SubscriptionRecord.cs | ||
| TenantRegistrationInfo.cs | ||
| UserGroupRef.cs | ||
| UserGroupRefType.cs | ||
| UserInfo.cs | ||