Commit Graph

16839 Commits

Author SHA1 Message Date
Vashchuk Nikita
0a384b2c28 refactoring async methods 2022-02-16 15:57:37 +03:00
80f97ef50d Web: Components: ContextMenu: Added left padding for arrow icon 2022-02-16 15:22:46 +03:00
638390de68
Merge pull request #540 from ONLYOFFICE/feature/hide-filter-sort
Feature/hide filter sort
2022-02-16 15:14:10 +03:00
Viktor Fomin
fb8e0748f6
Web: Campaigns: add ads examples 2022-02-16 14:11:49 +03:00
924d9bda34 Web: Files: Table: Added hiding sort actions inside TableHeader at recent and favorites folder 2022-02-16 13:58:57 +03:00
e6731ec23d Web: Components: TableHeader: Added property for hiding sort icon and disable sort actions 2022-02-16 13:57:59 +03:00
ee40f9ba7f Web: Files: Filter: Added hiding sort items inside filter at recent and favorites folder 2022-02-16 13:55:42 +03:00
02a9c6f973 Web: Common: FilterInput: Fixed displaying sort icon if sort items hidden 2022-02-16 13:54:11 +03:00
5a876ff5ab Web: Common: FilterInput: Added property for hiding sort items inside SortComboBox 2022-02-16 13:53:09 +03:00
Tatiana Lopaeva
05cd52bb77
Merge pull request #539 from ONLYOFFICE/bugfix/fix-file-name-when-rename
Fixed Bug 55530 - Client.Files. Fixed the display of the file name wh…
2022-02-16 13:42:51 +03:00
62b4b55dca Web: Files: moved isEdit, titleWithoutExt to inject 2022-02-16 13:18:14 +03:00
5322ed2cec Fixed Bug 55530 - Client.Files. Fixed the display of the file name when renaming. 2022-02-16 12:03:22 +03:00
697dd5dd39 fix 53348 2022-02-15 19:30:27 +03:00
73933162d5 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 19:16:20 +03:00
c1541d7901 Fixed Bug 55248 - Mobile.Client.Profile. Fixed closing the profile save window on the avatar editor page 2022-02-15 19:16:14 +03:00
5e12bf583c Fix Bug 54825 - Client.Clouds.‘Uncaught (in promise) undefined’ 2022-02-15 18:39:14 +03:00
a67773bf6d
Merge pull request #535 from ONLYOFFICE/feature/refactoring-files-formats
Web: Files: removed FormatsStore, added getting file formats from Set…
2022-02-15 18:04:47 +03:00
7f4d29da03 Web: Editor: fixed canConvert 2022-02-15 16:57:32 +03:00
ead3820e66 Merge branch 'feature/refactoring-files-formats' of github.com:ONLYOFFICE/AppServer into feature/refactoring-files-formats 2022-02-15 16:33:00 +03:00
51a9e48a1b Web: Files: fixed encryptionUploadDialog 2022-02-15 16:32:21 +03:00
1aa99f3802 Web: Files: removed TODO 2022-02-15 16:31:57 +03:00
Vashchuk Nikita
b17119b711 refactoring async methods 2022-02-15 16:20:06 +03:00
b04b6d897d Merge branch 'hotfix/v1.1.1' into feature/refactoring-files-formats 2022-02-15 16:13:52 +03:00
ccc0838269 Web: Files: removed FormatsStore, added getting file formats from SettingsStore 2022-02-15 15:58:31 +03:00
fd64f84b1b Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 15:57:40 +03:00
fb5edcf627 Fixed Bug 51725 - Client.Clouds.Changed title of third party folder. 2022-02-15 15:57:11 +03:00
264b3a8764 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 14:10:44 +03:00
ce048a9646 Web: Components: fix avatar resize 2022-02-15 14:10:28 +03:00
2f5feb4041 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 14:03:41 +03:00
c710545bdd Fixed Bug 55331 - Added default cursor for modal dialog. 2022-02-15 14:02:52 +03:00
d64fe81e5e Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 13:29:36 +03:00
af51658493 Web: Campaigns: init example 2022-02-15 13:09:44 +03:00
2ba6962e8c Fix Bug 55527 - Client.Files. Badge ‘New’ on Save as/Create a copy/Upload. 2022-02-15 13:01:37 +03:00
Vashchuk Nikita
41d994ca32 fix 2022-02-15 12:42:47 +03:00
b9f6ec6615 Web: Components: fix banner loader 2022-02-15 11:58:12 +03:00
f26eb17fe1 Web: Common: move shell changes from hotfix/campaigns banner 2022-02-15 11:37:31 +03:00
175e07b1d2 Web: Files: fix ads timeout 2022-02-15 11:34:40 +03:00
0850e20d63 Web: Common: move firebase config from hotfix/campaigns banner 2022-02-15 11:34:15 +03:00
aae5f2c3b0 Web: Files: move new banner from hotfix/campaigns banner 2022-02-15 11:33:43 +03:00
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
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