pavelbannov bc6b0d9e0d Merge branch 'hotfix/v1.1.2' into develop ... # 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		2023-08-28 18:53:10 +03:00
..
Tenant.cs	Merge branch 'hotfix/v1.1.2' into develop	2023-08-28 18:53:10 +03:00
TenantAuditSettings.cs	added more descriptions and data types	2023-04-25 19:23:54 +03:00
TenantCookieSettings.cs	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
TenantDomainValidator.cs	Settings: TenantDomainValidator	2023-01-26 15:31:06 +03:00
TenantExceptions.cs	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
TenantIndustry.cs	added new license headers	2022-03-15 21:00:53 +03:00
TenantQuota.cs	backend: updated some dll	2023-08-08 19:43:14 +03:00
TenantQuotaException.cs	added new license headers	2022-03-15 21:00:53 +03:00
TenantQuotaPriceResolver.cs	Merge branch 'develop' into feature/optimization-ef	2023-05-30 14:13:02 +03:00
TenantQuotaRow.cs	add dbTenant in models and rename "tenant" to "tenantid"	2023-04-25 00:17:29 +03:00
TenantStatus.cs	added new license headers	2022-03-15 21:00:53 +03:00
TenantTrustedDomainsType.cs	fixes for api docs	2023-04-13 12:43:54 +03:00
TenantUserQuotaSettings.cs	Quota: user quota storage core_user -> webstudio_settings	2022-09-15 15:38:31 +03:00
TenantUtil.cs	removed unnecessary	2022-08-25 13:54:11 +03:00
TenantVersion.cs	added more descriptions and data types	2023-04-25 19:23:54 +03:00