Commit Graph

7579 Commits

Author SHA1 Message Date
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
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
6ba390ea62 Web: Files: AutoBackup: optimization, refactoring. 2022-02-14 17:06:26 +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
9ef0e03143 Fixed Bug 55330 - Client. Fixed header title. 2022-02-14 14:31:31 +03:00
70b3231756 Merge branch 'develop' into feature/backup 2022-02-14 10:51:38 +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
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
77e14da218 fixed tests 2022-02-10 16:24:55 +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
caa4db9790 add new lines (Files-Home) 2022-02-10 11:10:35 +03:00
8220d23a10 Files: fixed response 2022-02-09 17:34:09 +03:00
f8a748aae3 Web: files: Code simplification. 2022-02-09 17:25:40 +03:00
b81b34fc99 Web: Files: FilesStore: Fixed folder check for selector 2022-02-09 16:47:57 +03:00
804c9c9547 Web: Locales: EN: Added translation for menu categories 2022-02-09 16:46:28 +03:00
5e47e0c184 Web: Files: HOC: Added model for context menu. Added multilevel menu for desktop view. 2022-02-09 16:45:09 +03:00
e66cb3d716 Fixed Bug 55412 - Client.Files. ‘Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'slice')’ when converting a file. 2022-02-09 16:25:26 +03:00
be6602b22a Fixed Bug 55242 - Mobile.Tablet.Client.Files. ‘Something went wrong’ when switching thumbnail view to normal view. Fixed table re-render 2022-02-09 15:46:38 +03:00
e8c2ce8294 Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2022-02-09 15:29:14 +03:00
a7337f6580 Web: Files: ManualBackup: Optimization, refactoring. 2022-02-09 15:08:48 +03:00
d429bcc731 Merge branch 'develop' into feature/backup 2022-02-09 12:40:16 +03:00
d54d3a938e Web: e2e-tests: Update tests screenshots 2022-02-08 19:41:50 +03:00
78fb372dcd Web: e2e-tests: Fix create user test 2022-02-08 18:05:45 +03:00
aac83608a2 Web: Files: SelectFolderDialog: Added missing prop. 2022-02-08 10:32:51 +03:00
dc4ea0c6f8 Files: fixed put sharedlink method 2022-02-07 22:57:23 +03:00
b1be9953ad fixed solution build 2022-02-07 22:15:32 +03:00
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
37c88dad50 Analyzers: fix 2022-02-07 18:10:27 +03:00
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
33c0e49705 add new file (Home) (de, es, fr, it, zh-CN, ro), update ja UploadPanel 2022-02-07 16:44:59 +03:00
7b33fab99f Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-07 16:24:08 +03:00
8250b774cd add new lines (UploadPanel), add new file (Home) (de, es, fr, it, zh-CN, ro) 2022-02-07 16:23:43 +03:00
0103dd1a3e Web: Files: fixed socketHelper connection after marge 2022-02-07 16:41:24 +05:00
40d56075f1 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/EF/BackupsContext.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Controllers/BackupController.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	products/ASC.Files/Client/public/locales/en/OperationsPanel.json
#	products/ASC.Files/Client/public/locales/en/Settings.json
#	products/ASC.Files/Client/public/locales/ru/Settings.json
#	products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/webpack.config.js
2022-02-07 12:40:50 +03:00
689723b6f2 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-04 21:02:31 +05:00
3e1a620f80 Web: Files: section optimization 2022-02-04 20:57:21 +05:00
Vashchuk Nikita
5aa99ec811 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/services/ASC.AuditTrail/AuditEventsRepository.cs
#	common/services/ASC.AuditTrail/LoginEventsRepository.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
2022-02-04 16:04:52 +03:00
731cbc649b
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
2022-02-03 20:58:18 +03:00
ce07a2f800 Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io
# Conflicts:
#	products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
2022-02-03 15:10:40 +03:00
655ae73a65 Web: Files: Fix refresh last page on delete all items (+ socket refactoring) 2022-02-03 14:57:23 +03:00
Vashchuk Nikita
f4f7a406b1 fix 2022-02-03 14:52:14 +03:00
34dab043e0 Merge branch 'develop' into feature/analizators
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
2022-02-03 12:55:33 +03:00
668df4f5fe Files: fix 2022-02-03 12:44:27 +03:00
0dcdaf7f0e Files: fix 2022-02-03 12:41:30 +03:00
567e8495cb Files: fix 2022-02-03 12:32:37 +03:00
14a06f6150 Files: fix 2022-02-03 12:30:30 +03:00
d91e433ba4 Socket: methods "getroomname" moved to SocketManager.
Newtonsoft replaced with System.Text.Json
2022-02-03 12:26:39 +03:00
43e4f142d0 Revert "Web: files: Fixed last page operations."
This reverts commit fe1b57fb2c.
2022-02-03 11:02:45 +03:00
9c37c3a171 Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io 2022-02-03 10:44:11 +03:00
0d478e43d0 Web: Files: Rewrite socket.io upload files process to client side 2022-02-03 10:44:03 +03:00
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
fe1b57fb2c Web: files: Fixed last page operations. 2022-02-02 15:17:03 +03:00
Artem Tarasov
6562e36a13
Merge pull request #502 from ONLYOFFICE/bugfix/fix-display-images-in-media-viewer
Bugfix/fix display images in media viewer
2022-02-02 14:55:38 +03:00
9e35b797ba Web:Files:Added removal of the isFirstUrl key from localStorage. 2022-02-02 14:20:29 +03:00
bb28679fdf analizators: bugfix 2022-02-02 14:05:06 +03:00
61b0b012ff Web: Files: removed min-width for Tile 2022-02-02 13:27:35 +03:00
6d6d0ef6d6 Files: fix StartConversion method 2022-02-01 21:12:56 +03:00
94dc14c7a1 Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io 2022-02-01 18:07:31 +03:00
98ca84b1dc Web: Socket: Removed support of "create/delete folders" operations (too many issues on client side) 2022-02-01 18:07:23 +03:00
353eb82d88 Merge branch 'feature/socket-io' of github.com:ONLYOFFICE/AppServer into feature/socket-io 2022-02-01 17:57:33 +03:00
e05a95f06d Web: Files: fixed isEditing for dialogs 2022-02-01 17:57:16 +03:00
b4ac2c4e9f Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io 2022-02-01 16:48:43 +03:00
bf01ee98d9 Web: Socket: Fixed adding a file to the same folder when moving/copying a file (when overwriting a file with the same name). 2022-02-01 15:29:24 +03:00
4bca2a87d2 Web: Files: Fixed page crash when copying. 2022-02-01 15:23:24 +03:00
bc63d972d1 Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io 2022-02-01 10:43:03 +03:00
29930f244d Web:Files:Added setToPreviewFile to MediaViewer. Changed setToPreviewFile in MediaViewerDataStore. 2022-01-31 18:58:26 +03:00
Vashchuk Nikita
2901d837a1 async methods for httpClient in ASC.Web 2022-01-31 17:35:36 +03:00
f5653810eb add lo (ConvertPasswordDialog) 2022-01-31 16:52:38 +03:00
4aa2211af6 Web: Files: removed unused socketStore, fixed mobx warning 2022-01-31 16:37:39 +03:00
0874bd6157 Web: Files: Commented logs 2022-01-31 16:27:45 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
a11d24db47 Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-01-31 13:09:11 +03:00
b2de188cdc Web: Files: Added missing calls of socket 2022-01-31 12:57:14 +03:00
55612b6558 Web: Files: Added move folder by socket 2022-01-31 11:35:32 +03:00
b91348695e Web:Common:Changed props previewFile to isPreviewFile. Changed propTypes to boolean for isPreviewFile. Web:Files:Added onButtonBackHandler function. 2022-01-30 21:46:39 +03:00
01b515cf84 Files: Refactoring of GetSocketRoom 2022-01-28 17:47:24 +03:00
101bd05ec7 fix bug 2022-01-28 17:42:11 +03:00
8add87820c Web:Files:Added isFirstUrl data to localStorage. Changed the condition for changing the url. 2022-01-28 16:34:15 +03:00
413b5373a2 Web: Files: Fix delete folder by socket 2022-01-28 16:28:40 +03:00
58aec95942 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-01-28 16:14:32 +03:00
22b4f9555b Fixed Bug 55056 - Client.Files. Added selection reset after drag and drop 2022-01-28 16:14:26 +03:00
155c5f20f2 Fixed Bug 55165 - Client.Files. The logic of saving changes in user actions has been changed. 2022-01-28 15:37:27 +03:00
57da2c739b Fixed Bug 55065 - Client.Files.Removed "Full access" rights for a file requiring conversion. 2022-01-28 13:45:22 +03:00
d81b941c36 Fixed Bug 55097 - Client.Files. Remove element of filter "Folders/Not subfolders" in Trash folder. 2022-01-28 11:16:29 +03:00
d01ae8b347 Web:Files:Added onChangeUrl function to MediaViewer. Added onpopstate event to add id to store MediaViewerData. 2022-01-27 18:48:52 +03:00
395b1a2e0b Web: Files: Added hide unpin article when select settings module. 2022-01-27 15:59:06 +03:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00