Commit Graph

16646 Commits

Author SHA1 Message Date
12243c7cc8 fix 55063 2022-02-15 11:01:27 +03:00
0ef8f00fb3 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 10:14:19 +03:00
a1eb764f2b Web:Files:Fix display images in media viewer. 2022-02-15 10:13:54 +03:00
cfa53b3450 Web:Common:Fix display images in media viewer. 2022-02-15 10:13:35 +03:00
51d1fb09cf
Merge pull request #527 from ONLYOFFICE/bugfix/fixed-files-file-status
Web: Files: fixed files fileStatus
2022-02-14 22:17:58 +03:00
d973e0ee54 Web: Files: Added displaying New badge on socket s:modify-folder->create 2022-02-14 22:17:19 +03:00
Sergey Kirichenko
6e20d619d1 Mod socket proxy conf 2022-02-14 18:41:15 +03:00
2dac619d61 Fixed Bug 55248 - Mobile.Client.Profile. Fixed closing the profile save window on the avatar editor page 2022-02-14 16:32:39 +03:00
01f8f95556 Fixed Bug 55058 - Client.Profile. Fixed broken images in "Sample title" when zooming in on a profile picture in the "Edit Photo" window. 2022-02-14 15:54:38 +03:00
9ef0e03143 Fixed Bug 55330 - Client. Fixed header title. 2022-02-14 14:31:31 +03:00
Dmitry Kulak
b87c56f971 Web: Studio: SSO: validate method now throws errors 2022-02-14 13:20:10 +03:00
Dmitry Kulak
43c2458e19 Web: Studio: SSO: url regexp fix 2022-02-14 12:47:09 +03:00
Dmitry Kulak
14282d7a6f Web: Studio: SSO: Added validation 2022-02-14 12:42:59 +03:00
Dmitry Kulak
18edef78ba Web: Studio: SSO: Refactoring 2022-02-14 12:40:35 +03:00
Dmitry Kulak
f18800b428 Web: Studio: SSO: Renamed addParameter to addArgument 2022-02-14 12:39:05 +03:00
Vashchuk Nikita
631dcdc2e8 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
#	common/ASC.Data.Storage/CrossModuleTransferUtility.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Extensions.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	products/ASC.CRM/Server/Api/VoipController.cs
#	products/ASC.CRM/Server/Core/Dao/RelationshipEventDao.cs
#	products/ASC.CRM/Server/Utils/PdfCreator.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
#	web/ASC.Web.Core/Files/DocumentServiceLicense.cs
#	web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
#	web/ASC.Web.Core/Recaptcha.cs
#	web/ASC.Web.Core/Utility/UrlShortener.cs
2022-02-12 00:51:48 +03:00
Vashchuk Nikita
4fb0bf2e46 fix 2022-02-11 21:18:12 +03:00
6b8304304f fixed starting services 2022-02-11 19:01:38 +03:00
a497f3ff19 Web: Files: fixed files fileStatus 2022-02-11 13:42:17 +03:00
Dmitry Kulak
608c271d83 Web: Studio: SSO: Removed unused code 2022-02-11 11:00:00 +03:00
Dmitry Kulak
4ea6e65d74 Web: Studio: SSO: Reorganized imports 2022-02-11 10:53:06 +03:00
Vashchuk Nikita
7164c54b44 fix 2022-02-10 21:25:40 +03:00
8a0aeda83c Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 19:50:30 +03:00
fecb7d5e37 Fix Bug 49777 - Docs. The version icon does not appear next to the file name after it has been created and edited. 2022-02-10 19:49:44 +03:00
2736a945dc Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 18:57:21 +03:00
fc8afde327 Fixed Bug 55449 - Client.Files. Fixed copying of file opened in editor. 2022-02-10 18:57:11 +03:00
a060c5954d WebL Files: Fix Bug 55397 - Client.Files. Open location menu on Folder 2022-02-10 17:19:21 +03:00
Dmitry Kulak
aae16cd61a Web: Studio: SSO: Fixed webpack warning 2022-02-10 17:10:39 +03:00
77e14da218 fixed tests 2022-02-10 16:24:55 +03:00
79532ea198 Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 15:23:37 +03:00
Dmitry Kulak
7cf49a6a3d Web: Studio: SSO: Updated translations 2022-02-10 14:49:11 +03:00
Dmitry Kulak
756480dac9 Web: Studio: SSO: Refactored page with new subcomponents and Mobx store 2022-02-10 14:48:32 +03:00
Dmitry Kulak
d095fd18f8 Web: Studio: utils: Added addParameter file to index reexport 2022-02-10 14:45:07 +03:00
Dmitry Kulak
06b4dfc72d Web: Studio: SSO: Extracted styled components to separate folder 2022-02-10 14:44:27 +03:00
Dmitry Kulak
8bdd33da00 Web: Studio: SSO: Made UploadXML subcomponent 2022-02-10 14:43:53 +03:00
Dmitry Kulak
6678324051 Web: Studio: SSO: Made mobx store 2022-02-10 14:42:48 +03:00
Dmitry Kulak
288da1bbf8 Web: Studio: SSO: Extracted constants to separate file 2022-02-10 14:42:16 +03:00
Dmitry Kulak
9c3673bc0f Web: Studio: SSO: Made AddCertificateModal subcomponent 2022-02-10 14:41:34 +03:00
Dmitry Kulak
ca34cf7571 Web: Studio: SSO: Made ToggleSSO subcomponent 2022-02-10 14:41:12 +03:00
Dmitry Kulak
eee26cf4d0 Web: Studio: SSO: Made HideButton subcomponent 2022-02-10 14:40:36 +03:00
Dmitry Kulak
9dda1facda Web: Studio: SSO: Made SimpleCheckbox subcomponent 2022-02-10 14:40:01 +03:00
Dmitry Kulak
5563a9ecf2 Web: Studio: SSO: Made SimpleComboBox subcomponent 2022-02-10 14:39:33 +03:00
Dmitry Kulak
1f9917ed01 Web: Studio: utils: Made addParameter function 2022-02-10 14:38:56 +03:00
Dmitry Kulak
76861ba9b6 Web: Studio: SSO: Made SimpleFormField subcomponent 2022-02-10 14:36:40 +03:00
Dmitry Kulak
8ab82ea0a6 Web: Studio: SSO: Made SimpleTextInput subcomponent 2022-02-10 14:35:31 +03:00
Dmitry Kulak
efd3dd94ed Web: Components: Label: Added children prop 2022-02-10 14:30:29 +03:00
Dmitry Kulak
76615ec22d Web: Components: FieldContainer: Added inlineHelpButton prop 2022-02-10 14:29:15 +03:00
Dmitry Kulak
0ff2975d24 Web: Components: Checkbox: Added missing name prop 2022-02-10 14:27:05 +03:00
50137b8c12 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 11:25:12 +03:00
ef87651b3a Fixed Bug 55254 - Client.Files. Fixed the change of the cursor to the "palm" 2022-02-10 11:25:00 +03:00