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 |
||
---|---|---|
.. | ||
About.json | ||
ArchiveDialog.json | ||
Article.json | ||
BackupCodesDialog.json | ||
ChangeEmailDialog.json | ||
ChangeOwnerPanel.json | ||
ChangePasswordDialog.json | ||
ChangePhoneDialog.json | ||
ChangePortalOwner.json | ||
ChangeUserStatusDialog.json | ||
ChangeUserTypeDialog.json | ||
Confirm.json | ||
ConflictResolveDialog.json | ||
ConnectDialog.json | ||
ConvertDialog.json | ||
ConvertPasswordDialog.json | ||
CreateEditRoomDialog.json | ||
DataLossWarningDialog.json | ||
DeleteDialog.json | ||
DeleteProfileEverDialog.json | ||
DeleteSelfProfileDialog.json | ||
DeleteThirdPartyDialog.json | ||
DeleteUsersDialog.json | ||
DowngradePlanDialog.json | ||
DownloadDialog.json | ||
EmbeddingPanel.json | ||
EmptyTrashDialog.json | ||
Errors.json | ||
Files.json | ||
FilesSettings.json | ||
FormGallery.json | ||
HotkeysPanel.json | ||
InfoPanel.json | ||
InviteDialog.json | ||
JavascriptSdk.json | ||
MainBar.json | ||
NewFilesPanel.json | ||
Notifications.json | ||
Payments.json | ||
PaymentsEnterprise.json | ||
People.json | ||
PeopleSelector.json | ||
PeopleTranslations.json | ||
PortalUnavailable.json | ||
PreparationPortal.json | ||
PrivacyPage.json | ||
Profile.json | ||
ResetApplicationDialog.json | ||
RoomSelector.json | ||
SalesDepartmentRequestDialog.json | ||
SelectFolder.json | ||
SendInviteDialog.json | ||
Settings.json | ||
SharingPanel.json | ||
SingleSignOn.json | ||
SmartBanner.json | ||
SMTPSettings.json | ||
Translations.json | ||
UploadPanel.json | ||
VersionHistory.json | ||
Wizard.json |