Commit Graph

16807 Commits

Author SHA1 Message Date
d05234bf6c Web: Common: added main-bar styles 2022-02-01 13:17:37 +05:00
088e078c1c Web: Common: added top, margin top params, fixed styles 2022-02-01 13:17:10 +05:00
dfaa34ac39 Web: Common: added main bar 2022-02-01 12:59:42 +05:00
7c7263c23a Web: Files: fixed header top 2022-02-01 12:58:19 +05:00
f6b374226f Web: Client: added skip maintenance param, added onLoad func for bar config 2022-02-01 12:51:49 +05:00
a40e8bf755 Web: Client: deleted checkedMaintenance 2022-02-01 12:49:38 +05: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
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
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
8428ef730c
Merge pull request #498 from ONLYOFFICE/feature/accessRightSelect
Feature/access right select
2022-01-28 13:00:47 +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
218990c4fa b:Common: Added props onChangeUrl to the MediaViewer component. 2022-01-27 18:48:14 +03:00
Yaroslavna Gaivoronyuk
fdec7246ec Merge branch 'feature/accessRightSelect' of github.com:ONLYOFFICE/AppServer into feature/accessRightSelect 2022-01-27 17:29:56 +03:00
Yaroslavna Gaivoronyuk
e068a183d1 update README.md 2022-01-27 17:29:39 +03:00
0c2085a168
Merge branch 'develop' into feature/accessRightSelect 2022-01-27 16:52:54 +03:00
Yaroslavna Gaivoronyuk
73c6bcb4f8 upd 2022-01-27 16:45:02 +03:00
Yaroslavna Gaivoronyuk
bb6c826b74 Merge branch 'feature/accessRightSelect' of github.com:ONLYOFFICE/AppServer into feature/accessRightSelect 2022-01-27 15:59:32 +03:00
395b1a2e0b Web: Files: Added hide unpin article when select settings module. 2022-01-27 15:59:06 +03:00
Yaroslavna Gaivoronyuk
ee375307fb change props, upd story 2022-01-27 15:58:56 +03:00
dbafbc738c Web: Client: fixed the navbar positioning 2022-01-27 17:45:01 +05:00
b7f0ffc9d2 cache: fixed memory cache notify 2022-01-27 15:35:11 +03:00
a15e651aea Web: Files: changed the banner existence check, added onLoad, onClose function for snackbar 2022-01-27 17:22:53 +05:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
c951d69e3f Web: Files: added checked maintenance params 2022-01-27 17:20:10 +05:00
29f83f9cb7
Merge pull request #497 from ONLYOFFICE/bugfix/remove-loader-after-switch-modules
Removed loader after switch modules
2022-01-27 15:19:42 +03:00
5f843a1d5d Web: Client: added checked and exist params for maintenance banner 2022-01-27 17:19:03 +05:00
988e822a80 Web: Client: changed positioning when there is a banner on the page 2022-01-27 17:16:47 +05:00
45313ba07f Web: Files: Fixed the length of the row separators according to the layout. 2022-01-27 13:54:33 +03:00
3f1b9c7a7a Merge branch 'hotfix/v1.1.1' into bugfix/remove-loader-after-switch-modules
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
2022-01-27 13:16:21 +03:00
bbef3fd2d0 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-01-27 12:43:00 +03:00