Commit Graph

7615 Commits

Author SHA1 Message Date
902b2b54eb Web: People: fixed table style 2022-02-24 11:33:58 +03:00
d7f16aa96d Web: Table: fixed table styles 2022-02-24 11:20:32 +03:00
d65d30ec24 Test: disable socketio 2022-02-23 17:10:04 +03:00
81b33e673a Files: fix warnings 2022-02-23 17:09:32 +03:00
3d4e000778 Merge branch 'develop' into feature/async
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-02-23 16:01:55 +03:00
1379800971 Files: fix async 2022-02-23 13:42:14 +03:00
deeff80f26 Web: TabLe: refactoring table view 2022-02-22 16:00:26 +03:00
a797b3490e Files: async fixes 2022-02-22 12:22:15 +03:00
2a7616585e Web: Components: fixed table view 2022-02-22 12:10:27 +03:00
3aeac42444 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
#	common/services/ASC.ElasticSearch/Service/Settings.cs
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
#	common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/table-container/TableRow.js
#	products/ASC.Files/Client/public/locales/az/Home.json
#	products/ASC.Files/Client/public/locales/bg/Home.json
#	products/ASC.Files/Client/public/locales/bg/Translations.json
#	products/ASC.Files/Client/public/locales/cs/Home.json
#	products/ASC.Files/Client/public/locales/de/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/de/Home.json
#	products/ASC.Files/Client/public/locales/de/Translations.json
#	products/ASC.Files/Client/public/locales/de/UploadPanel.json
#	products/ASC.Files/Client/public/locales/el/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/el/Home.json
#	products/ASC.Files/Client/public/locales/en/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/en/Home.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/en/UploadPanel.json
#	products/ASC.Files/Client/public/locales/es/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/es/Home.json
#	products/ASC.Files/Client/public/locales/es/UploadPanel.json
#	products/ASC.Files/Client/public/locales/fi/Home.json
#	products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/fr/Home.json
#	products/ASC.Files/Client/public/locales/fr/Translations.json
#	products/ASC.Files/Client/public/locales/it/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/it/Home.json
#	products/ASC.Files/Client/public/locales/it/Translations.json
#	products/ASC.Files/Client/public/locales/it/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ja/Home.json
#	products/ASC.Files/Client/public/locales/ja/UploadPanel.json
#	products/ASC.Files/Client/public/locales/lv/Home.json
#	products/ASC.Files/Client/public/locales/nl/Home.json
#	products/ASC.Files/Client/public/locales/nl/Translations.json
#	products/ASC.Files/Client/public/locales/pl/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/pt-BR/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/Translations.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/ru/Home.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/public/locales/ru/UploadPanel.json
#	products/ASC.Files/Client/public/locales/sk/Home.json
#	products/ASC.Files/Client/public/locales/tr/Home.json
#	products/ASC.Files/Client/public/locales/uk/Home.json
#	products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/vi/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
#	products/ASC.Files/Client/src/HOCs/withBadges.js
#	products/ASC.Files/Client/src/HOCs/withContent.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	public/locales/de/Common.json
2022-02-21 22:22:38 +03:00
6ed624844b Web: People: Re-write setIsEdit to arrow function 2022-02-18 11:17:58 +03:00
eccb588362 Web: People: Profile: Added default width for language selector 2022-02-17 14:38:49 +03:00
e848d5d979 Web: Files: Table/Filter: Restored sorting inside favorite folder 2022-02-17 12:45:55 +03:00
7e011de3cf Web: People: fixed display of registration date/birthday in user profile 2022-02-17 11:46:50 +03:00
7419eb87dc Web: People: Added opportunity to unsubscribe from mailing list on My Profile page (/my?unsubscribe=tips) 2022-02-16 21:34:19 +03:00
Vashchuk Nikita
0a384b2c28 refactoring async methods 2022-02-16 15:57:37 +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
924d9bda34 Web: Files: Table: Added hiding sort actions inside TableHeader at recent and favorites folder 2022-02-16 13:58:57 +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
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
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
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
fb5edcf627 Fixed Bug 51725 - Client.Clouds.Changed title of third party folder. 2022-02-15 15:57:11 +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
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
175e07b1d2 Web: Files: fix ads timeout 2022-02-15 11:34:40 +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
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