Andrey Savihin ad93ede662 Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data ... # Conflicts: # products/ASC.People/Server/Api/UserController.cs # products/ASC.People/Server/GlobalUsings.cs		2023-09-13 15:44:16 +03:00
..
About.json
ArchiveDialog.json
Article.json
BackupCodesDialog.json
ChangeEmailDialog.json
ChangeOwnerPanel.json
ChangePasswordDialog.json
ChangePhoneDialog.json
ChangePortalOwner.json
ChangeUserTypeDialog.json
Confirm.json
ConflictResolveDialog.json
ConnectDialog.json
ConvertDialog.json
ConvertPasswordDialog.json
CreateEditRoomDialog.json
DataLossWarningDialog.json
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
Files.json	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
FilesSettings.json
FormGallery.json
HotkeysPanel.json
InfoPanel.json
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
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: Removed old translations.	2023-09-08 11:29:20 +03:00
SharingPanel.json
SingleSignOn.json
SmartBanner.json
SMTPSettings.json	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
Translations.json	Web: Deleted old translations.	2023-09-08 11:34:35 +03:00
UploadPanel.json
VersionHistory.json
Webhooks.json	Fix EnDublicatesByContentTest issue (replaced key)	2023-09-08 19:00:12 +04:00
Wizard.json