Commit Graph

7803 Commits

Author SHA1 Message Date
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
32868de412 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	public/locales/de/Common.json
2022-02-22 13:53:00 +03:00
a797b3490e Files: async fixes 2022-02-22 12:22:15 +03:00
Timofey
82e1af9828 Web:People: add new key for translations 2022-02-22 17:13:00 +08:00
Timofey
f6fdb1ce66 Web:People: add new filter 2022-02-22 17:12:44 +08:00
Timofey
06a83fdfa7 Web:People: fix display catalog main button 2022-02-22 17:12:19 +08:00
Timofey
dfde24aff5 Web:Files: refactroing filter 2022-02-22 17:11:21 +08:00
Timofey
fe75dc72b2 Web:People: fix catalog main button 2022-02-22 17:10:57 +08:00
2a7616585e Web: Components: fixed table view 2022-02-22 12:10:27 +03:00
Timofey
45c521cd08 Web:People: add new filter input 2022-02-22 16:51:05 +08: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
Timofey
eb78d0cd26 Web:People:Dialogs: add theme as props in change password dialog 2022-02-21 21:33:38 +08:00
Timofey
7a97d482f0 Web:People:Home: remove mobile main button from empty screen on desktop devices 2022-02-21 20:04:24 +08:00
Timofey
e796f7fcc6 Web:Files:Filter: add sort on tablet and mobile view 2022-02-18 22:10:20 +08:00
Timofey
8c73f93eed Web:Files:Catalog: fix section rerender when catalog opening on mobile 2022-02-18 20:46:49 +08: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
7db322fc8b
Merge branch 'develop' into feature/login-redesign 2022-02-17 14:09:22 +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
Timofey
894ec8a429 Web:People:ProfileAction: change group selector in form action 2022-02-16 17:07:20 +08:00
Timofey
2e288faf7e Web:People:Components: fix label for all users groups 2022-02-16 17:06:46 +08:00
Timofey
908122694d Web:People:Components: refactoring group selector 2022-02-16 17:05:56 +08:00
5322ed2cec Fixed Bug 55530 - Client.Files. Fixed the display of the file name when renaming. 2022-02-16 12:03:22 +03:00
Timofey
63568d0c4a Web:People: add new key 'AllGroups' for group selector for en and ru locales 2022-02-16 16:57:38 +08:00
Timofey
2f7b4e1453 Web:Files:Panels: change group selector view in add groups panel 2022-02-16 16:53:22 +08: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
Timofey
2bd0760168 Web:Files:Section: add new id for tile folder header 2022-02-15 19:04:31 +08:00
Timofey
d18fbd6950 Web:Files:Filter: change sort data 2022-02-15 19:02:01 +08: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
Timofey
7ac52c29c3 Web:Files:Panels: change view and add new props for people selector for change owner and add user panel 2022-02-15 15:20:05 +08:00
Timofey
5cd639f63d Web:People: add new key 'AddHeadOfDepartment' for group action for en locale 2022-02-15 15:17:38 +08:00
Timofey
61a525eb8e Web:People: add new keys 'AddUsers' and 'AllUsers' for people selector for en and ru locales 2022-02-15 15:16:02 +08: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
Timofey
92e668a182 Web:People:PeopleSelector: change default header label and all users group name 2022-02-15 15:05:30 +08:00
Timofey
b727092407 Web:People:GroupAction: change props for people selector for header and members select 2022-02-15 15:02:50 +08: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
Timofey
434e9cba40 Web:Files:Section: add new class name for folder tile header 2022-02-14 23:00:27 +08:00
65de0c4e97
Merge branch 'develop' into feature/hotkeys 2022-02-14 16:41:05 +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
Timofey
154fdb4a81 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-02-14 18:54:34 +08:00
Timofey
ec77078bd7 Web:People:Components: change people selector base props 2022-02-14 18:53:20 +08:00
Timofey
2059be9a95 Web:Files:Section: connect new filter input with backend API 2022-02-14 18:52:38 +08: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
6fa92a8376 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-02-10 18:03:31 +03:00
a0097b39ca Merge branch 'feature/hotkeys' of github.com:ONLYOFFICE/AppServer into feature/hotkeys 2022-02-10 17:46:05 +03:00
d2f17efea5 Web: Files: removed unused code 2022-02-10 17:45:47 +03:00
a060c5954d WebL Files: Fix Bug 55397 - Client.Files. Open location menu on Folder 2022-02-10 17:19:21 +03:00
ad08e03019
Merge branch 'develop' into feature/hotkeys 2022-02-10 16:51:23 +03:00
77e14da218 fixed tests 2022-02-10 16:24:55 +03:00
42ebb57828 Web: Files: Hotkeys: added macOs support 2022-02-10 15:48:26 +03:00
0e0ce0a9bb Web: Files: fixed hotkeys logic 2022-02-10 15:11:01 +03:00
655c0e9122 Web: Files: fixed hotkey symbol for macOS 2022-02-10 14:25:03 +03:00
0d302d5549 Web: Files: fixed files view after resize 2022-02-10 14:03:25 +03:00
b066587fdc Web: Files: fixed selectUpper 2022-02-10 12:44:25 +03:00
76a1c392c2 Web: Files: fixed hotkeys selection 2022-02-10 12:11:57 +03:00
019747995c Web: Files: fixed file selection hotkey 2022-02-10 12:00:12 +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
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
Timofey
092d870f69 Merge branch 'feature/virtual-rooms-1.2' into feature/new-filter-input 2022-02-09 19:54:45 +08:00
Timofey
f6e4cc4d71 Merge branch 'develop' into feature/new-filter-input 2022-02-09 19:54:11 +08:00
Timofey
af3a9f08eb Web: switch article component on catalog component 2022-02-09 19:48:11 +08:00
Timofey
0fd47c98b6 Web:Files:Components: change service items icons in third party dialog for dark-theme 2022-02-09 19:26:01 +08:00
d27a33f08f People: added simple wrapper for getbyid method
fixed invite link
2022-02-09 14:05:21 +03:00
52f8ab8695 Merge branch 'develop' into feature/hotkeys
# Conflicts:
#	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
2022-02-09 13:06:21 +03:00
bb1b31034f Web: Files: fixed hotkey selectionsUp 2022-02-09 12:44:23 +03:00
fca8a6ddec Web: Files: fixed hotkey bugs 2022-02-09 12:21:36 +03:00
d2cd7dbeaf Web: Files: fixed selection in hotkeys 2022-02-09 10:48:31 +03:00
Timofey
c52628270c Merge branch 'develop' into feature/virtual-rooms-1.2 2022-02-09 15:08:53 +08:00
f1eef443ff Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-02-08 23:00:28 +03:00
0184f2b319 Web: Client: fix clear errors, add enter submit 2022-02-08 22:31:15 +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
5fe51b2cd7 Web: Files: hotkeys refactoring 2022-02-08 15:55:08 +03:00
Timofey
caaa88d537 Web:Files: update empty screen trash image for dark-theme 2022-02-08 18:37:17 +08:00
Timofey
11032cee42 Web:Files: fix hover and active fill color for shared and form button in dark theme 2022-02-08 18:03:40 +08:00
Timofey
92ed07db23 Web:People: disable catalog main button in section for desktop view 2022-02-08 17:21:36 +08:00
26721629cf Web: Files: added closing HotkeysPanel after pressing "Esc" key 2022-02-08 12:14:36 +03:00
Timofey
13c0cd63a1 Web:People:Catalog: fix desktop mobile main button and add new view for tablet and mobile 2022-02-08 17:04:09 +08: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
Timofey
6f80b60091 Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2 2022-02-07 16:31:56 +08:00
c0a83cefac
Merge branch 'develop' into feature/dark-theme 2022-02-07 11:09:41 +03:00
Timofey
cef8df0a6e Web:Files:Catalog: add drag
drop
2022-02-07 16:07:26 +08: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
Timofey
d7dfa34dc6 Web:Files:Home: fix conflicts after merge 2022-02-04 23:25:24 +08: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
66f684eee2 Web: Files: added hotkey border 2022-02-04 15:04:21 +03:00
b30f488213 Web: Files: fixed preview hotkey description 2022-02-04 12:09:47 +03:00
34e11eb58a Web: Files: moved openFileAction to store, added hotkey for opening files/folders 2022-02-04 11:24:15 +03:00
731cbc649b
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
2022-02-03 20:58:18 +03:00
Timofey
267ac94226 Web:Files: change files menu svg 2022-02-04 00:08:30 +08:00
Timofey
f42ce0eb52 Web:People: change people menu svg 2022-02-04 00:04:27 +08:00
Timofey
bd8d8180f9 Web: fixed code format 2022-02-03 23:34:19 +08:00
4b6bd34222 Web: Files: added new hotkeys support 2022-02-03 17:49:17 +03:00
42f3f650b7 Web: Files: removed "Find/Next" hotkey 2022-02-03 16:58:11 +03:00
Timofey
c08b1460bc Web:Files:Home: fix context menu render on tile view 2022-02-03 21:22:31 +08:00
Timofey
223c04a3c7 Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2 2022-02-03 20:59:26 +08: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
98bd1efcf0 Web: Files: added HotkeysPanel 2022-02-03 14:52:55 +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
Timofey
918b138f92 Web:Common:Components: add clear trash button 2022-02-03 16:06:36 +08: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
Timofey
7086d0cc50 Web:Common:Navigation: change drop box width on tablet devices 2022-02-02 23:04:41 +08:00
3016c191d4 Web: Files: added hotkeys support for tile view 2022-02-02 17:41:29 +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
Timofey
512885373d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-02-02 19:35:42 +08: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
Timofey
427b10142c Merge branch 'develop' into feature/navigation 2022-02-02 17:31:53 +08: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
Timofey
f6090b4f58 Merge branch 'feature/navigation' into feature/virtual-rooms-1.2 2022-02-01 18:44:49 +08:00
Timofey
2870da6271 Web:Common:Components: fixed top and left position for navigation drop-box 2022-02-01 18:37:44 +08:00
Timofey
46afa9b16c Merge branch 'develop' into feature/navigation 2022-02-01 16:45:30 +08:00
Timofey
750becafb8 Merge branch 'feature/new-context-menu' into feature/virtual-room-1.2 2022-02-01 16:07:27 +08: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
Timofey
bc9dd07400 Merge branch 'develop' into branch feature/new-context-menu 2022-02-01 15:07:01 +08:00
29930f244d Web:Files:Added setToPreviewFile to MediaViewer. Changed setToPreviewFile in MediaViewerDataStore. 2022-01-31 18:58:26 +03:00
Timofey
cf3d4c71e3 Merge branch 'devlop' into branch feature/catalog 2022-01-31 23:52:52 +08:00
Timofey
140fc8fd1b Web:Files:Components: fixed floating number in secondary progress 2022-01-31 23:47:22 +08: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
Timofey
369801ddb7 Web:Files:Components: add primary and secondary progress in main button mobile view 2022-01-31 21:42:59 +08:00
Timofey
092a89a196 Web:Files:Store: add files count to secondary progress data store 2022-01-31 21:41:54 +08: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