Commit Graph

17048 Commits

Author SHA1 Message Date
a04f7824fc refactoring: webhooks.service: file-scope namespace 2022-02-03 16:41:09 +03:00
487a55a99e ApiCore: used file-scope namespaces, fix conflicts 2022-02-03 16:19:48 +03:00
524fb32a0d Merge branch 'feauter/refactoring' into feauter/asc-api-core-refactor 2022-02-03 16:08:15 +03:00
19fb0a50da refactoring: delete rule 2022-02-03 15:19:53 +03:00
62c8f69f25 Merge branch 'feature/refactoring' into 'feature/asc-clear-events-refactor' 2022-02-03 15:16:05 +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
b5e4d68550 ClearEvents: used file-scope namespaces 2022-02-03 14:54:31 +03:00
9f670d2b25 ClearEvents: add waiting for the end of the timer 2022-02-03 14:53:23 +03:00
Vashchuk Nikita
f4f7a406b1 fix 2022-02-03 14:52:14 +03:00
fdc4652edb AuditTrail: used file-scope namespaces 2022-02-03 14:16:34 +03:00
0cc387a4b8 rename LoginEvents to LoginEvent 2022-02-03 14:15:42 +03:00
0a17af12eb AuditTrail: add mapping actions 2022-02-03 14:02:49 +03:00
342daa3d18 AuditTrail: rename to Dto, change mapping 2022-02-03 14:02:27 +03:00
81e50c856e AuditTrail: remove unnecessary 2022-02-03 14:01:34 +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
df26903973 refactoring: webhooks.core 2022-02-02 17:47:35 +03:00
2ff2e64f4d refactoring: asc.webhooks.service 2022-02-02 17:23:15 +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
c2d3d10ec5 refactoring : bugfix 2022-02-02 13:09:37 +03:00
f6620e34ae Merge branch 'develop' into feature/refactoring 2022-02-02 13:09:25 +03:00
5a71df17d3 refactoring: bugfix 2022-02-02 12:02:49 +03:00
6d6d0ef6d6 Files: fix StartConversion method 2022-02-01 21:12:56 +03:00
084e3a8d30 ApiCore: IServiceProvider replaced by IServiceScopeFactory 2022-02-01 20:07:26 +03:00
498045e071 ClearEvents: IServiceProvider replaced by IServiceScopeFactory 2022-02-01 18:27:37 +03:00
e7df033899 AuditTrail: fix 2022-02-01 18:19:09 +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
23eaa4be39 Common: private properties replaced with fields, used single line expressions, cosmetic 2022-02-01 17:51:29 +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