Commit Graph

17137 Commits

Author SHA1 Message Date
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
Timofey
df305ea2b2 Web:Components:NewContextMenu: hide context menu when item clicked 2022-02-01 16:02: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
Timofey
91f0213c51 Web:Common:Components: disable floating button on mobile and tablet devices 2022-01-31 23:46:41 +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
Timofey
95353b1b4e Web:Common:Components: disable floating button on mobile devices 2022-01-31 21:40:43 +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
61bf57aa24 Update yarn.lock 2022-01-31 15:16:49 +03:00
47d43fbcfb WebL Editor: Removed commented code 2022-01-31 15:16:31 +03:00
17cb4a647b analizators: bugfix 2022-01-31 14:35:59 +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
353a362a19 fix test config 2022-01-28 16:54:43 +03:00
Timofey
21cd73a698 Web: restore code format 2022-01-28 21:44:58 +08: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
Timofey
95da73cda6 Web:Editor: app theme-support for loader background-color 2022-01-28 20:49:37 +08: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
Timofey
b00b9c7306 Web:Components:Theme: change button color, backdroundColor and border 2022-01-28 20:22:13 +08:00
Timofey
875c1e897a Web:Files:QuickButton: change color selected button 2022-01-28 20:01:36 +08:00
Timofey
47527c3430 Web:People:ProfileAction: add support dark-theme for link in tooltip 2022-01-28 19:46:46 +08:00
Timofey
98e4233a2d Web:Studio:Settings: add support dark-theme for link in tooltip 2022-01-28 19:31:56 +08:00
Timofey
13348fc004 Merge branch 'feature/dark-theme' of github.com:ONLYOFFICE/AppServer into feature/dark-theme 2022-01-28 19:03:55 +08:00
096bc6766e
Merge branch 'develop' into feature/dark-theme 2022-01-28 14:02:50 +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
Timofey
f2ac0c721b Merge branch 'feature/dark-theme' of github.com:ONLYOFFICE/AppServer into feature/dark-theme 2022-01-28 18:04:53 +08:00
Timofey
210ebd7ad1 Web:Files: add support dark-theme for select-file-dialog-aside_buttons class 2022-01-28 18:03:33 +08:00
92542a4a27 Merge branch 'feature/dark-theme' of github.com:ONLYOFFICE/AppServer into feature/dark-theme 2022-01-28 13:01:42 +03:00
5db134933b Web: Files: Fixed error when clicked on "change access rights" twice. 2022-01-28 13:01:08 +03:00
8428ef730c
Merge pull request #498 from ONLYOFFICE/feature/accessRightSelect
Feature/access right select
2022-01-28 13:00:47 +03:00
Timofey
3c53e73484 Web:Files:SimpleFileInput: add support dark-theme 2022-01-28 17:57:15 +08: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