pavelbannov b14d6c8ef0 Merge branch 'hotfix/v1.1.3' into develop ... # Conflicts: # common/ASC.Core.Common/Context/Impl/UserManager.cs # common/ASC.Core.Common/Core/ITenantService.cs # common/ASC.Core.Common/Data/DbTenantService.cs # common/ASC.Data.Storage/StorageHandler.cs # common/ASC.FederatedLogin/ASC.FederatedLogin.csproj # config/appsettings.json # config/nlog.config # migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs # migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs # packages/client/src/pages/Confirm/sub-components/createUser.js # packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js # packages/common/components/MoreLoginModal/index.tsx # packages/login/src/client/components/sub-components/LoginForm.tsx # products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs # products/ASC.Files/Core/Services/DocumentService/Configuration.cs # products/ASC.People/Server/Api/ThirdpartyController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Api/Core/CspSettingsHelper.cs # web/ASC.Web.Core/Users/UserManagerWrapper.cs # yarn.lock		2023-09-25 10:53:06 +03:00
..
About.json
ArchiveDialog.json
Article.json
BackupCodesDialog.json
ChangeEmailDialog.json
ChangeOwnerPanel.json
ChangePasswordDialog.json
ChangePhoneDialog.json
ChangePortalOwner.json
ChangeUserStatusDialog.json	web: Fix DocumentServiceLocationHeaderInfo value + auto refactoing	2023-09-22 16:25:41 +04:00
ChangeUserTypeDialog.json
Confirm.json	Client: delete useless translations	2023-09-13 15:51:15 +03:00
ConflictResolveDialog.json
ConnectDialog.json
ConvertDialog.json
ConvertPasswordDialog.json
CreateEditRoomDialog.json	added translations	2023-09-07 18:40:17 +03:00
DataLossWarningDialog.json
DataReassignmentDialog.json	web: Fix DocumentServiceLocationHeaderInfo value + auto refactoing	2023-09-22 16:25:41 +04:00
DeleteDialog.json	Web: Fix translations to other languages	2023-09-12 17:57:27 +04:00
DeleteProfileEverDialog.json	Web:Client:Delete DeleteUsersDialog translates, delete "DeleteUserMessage".	2023-07-12 21:39:03 +03:00
DeleteSelfProfileDialog.json
DeleteThirdPartyDialog.json
DowngradePlanDialog.json
DownloadDialog.json
EmbeddingPanel.json
EmptyTrashDialog.json
Errors.json	Client: delete useless	2023-09-20 17:35:56 +03:00
Files.json	Merge branch 'hotfix/v1.1.3' into develop	2023-09-25 10:53:06 +03:00
FilesSettings.json
FormGallery.json
HotkeysPanel.json
InfoPanel.json	added translations	2023-09-07 18:40:17 +03:00
InviteDialog.json
JavascriptSdk.json	edited API library	2023-08-25 17:25:26 +03:00
MainBar.json
NewFilesPanel.json	Web:Client:Change MarkAsRead to Viewed.	2023-09-12 13:00:15 +03:00
Notifications.json
Payments.json	Fix bug 63646 - Added a message when reaching the limit of paid users by invitation link.	2023-08-21 13:30:49 +03:00
PaymentsEnterprise.json	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
People.json
PeopleSelector.json	Web:Client:Change translation Account list to List accounts.	2023-09-18 18:43:18 +03:00
PeopleTranslations.json	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
PortalUnavailable.json
PreparationPortal.json
PrivacyPage.json
Profile.json
ResetApplicationDialog.json
RoomSelector.json
SalesDepartmentRequestDialog.json
SelectFolder.json
SendInviteDialog.json
Settings.json	Web: Client: fix long text in theme edit button	2023-09-18 13:28:32 +02:00
SharingPanel.json	added translations	2023-09-07 18:40:17 +03:00
SingleSignOn.json
SmartBanner.json
SMTPSettings.json	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
Translations.json	Merge branch 'develop' into feature/new-for-client	2023-09-08 18:51:06 +04:00
UploadPanel.json
VersionHistory.json
Webhooks.json	Fix EnDublicatesByContentTest issue (replaced key)	2023-09-08 19:00:12 +04:00
Wizard.json