Commit Graph

16804 Commits

Author SHA1 Message Date
mushka
626289110c rm tabs-container.test.js 2022-02-04 14:07:12 +03:00
mushka
43afc6a133 small fixes 2022-02-04 13:55:12 +03:00
mushka
74becd6437 completed submenu 2022-02-04 13:21:10 +03:00
3a16fdccfd Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner 2022-02-03 21:05:07 +03:00
731cbc649b
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
2022-02-03 20:58:18 +03:00
014e344bb6 Socket.svc: Restored kill process on node died 2022-02-03 19:12:29 +03:00
00bb2821bc Socket.svc: Restored logPath Environment 2022-02-03 18:57:26 +03:00
0f76ba3613 Fixed Bug 55236 - Editor: File from third-party storage is can added to favorites. 2022-02-03 17:49:00 +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
d0bb0c18a6 Web: Files: Fixed editing of converted file. 2022-02-02 19:32:38 +03:00
6750931fe9 Web: Files: Added error handler for request edit rights function. 2022-02-02 18:29:00 +03:00
76eead7708 Web: Files: Fixed editing of shared form. 2022-02-02 18:16:52 +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
bf07a141d8 Web:Common:Fix. 2022-02-02 14:22:41 +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
94d51d88b5 Web: ASC.Web.Campaigns: added gatsby project 2022-02-01 20:03:37 +05: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
01fdb34aaa Web: ACS.Web.Campaigns: delete submodule 2022-02-01 19:18:23 +05: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
b88f6a3659 Web: Files: fix header loader 2022-02-01 16:23:06 +05:00
94b364efcb Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner 2022-02-01 13:33:27 +05:00
6102fce721 Web: ASC.Web.Campaigns:added project for creating banner templates 2022-02-01 13:30:32 +05:00
f6a1d10a98 Web: Common: added maintenance exist param 2022-02-01 13:22:39 +05:00
3be43306b5 Web: Components: changed snackbar for new banner 2022-02-01 13:22:10 +05:00
e4c9198799 Web: Components: added styles 2022-02-01 13:20:14 +05:00
6a65f13c40 Web: Files: added consumer for Bar 2022-02-01 13:19:45 +05:00
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