Commit Graph

16934 Commits

Author SHA1 Message Date
9e583e60cb add AuditEvents dbset and model configuration 2022-02-07 17:06:25 +03:00
e00657439d ClearEvents: add events context 2022-02-07 17:06:00 +03:00
42bcb87eeb fixed the inability to create a folder named data in projects 2022-02-07 17:05:12 +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
b2e779d7d8 Merge branch 'feature/backend-refactor' into feature/asc-common-refactor 2022-02-04 23:27:29 +03:00
03f0eedf3a Merge branch 'feature/backend-refactor' into feature/asc-clear-events-refactor 2022-02-04 23:24:40 +03:00
c67c5e80e2 Merge branch 'feature/backend-refactor' into feature/asc-audit-trail-refactor 2022-02-04 23:20:49 +03:00
a913fa4589 Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor 2022-02-04 23:16:18 +03:00
8a90ccc30b
Merge pull request #504 from ONLYOFFICE/feature/refactoring
Feature/refactoring
2022-02-04 22:42:16 +03:00
e16d75839a Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop 2022-02-04 21:00:05 +03:00
eed733b83c fixed user photo thumbnail generator 2022-02-04 20:59:58 +03: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
a2cc00b521 fix test config (dotnet issue) 2022-02-04 18:40:55 +03: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
6d841257f1 Common: add IServiceScopeFactory 2022-02-04 12:56:15 +03:00
9f561702df Coomon: static private fields renamed as per microsoft convention 2022-02-04 12:46:24 +03:00
8c203b07c2 rename intermediate model 2022-02-04 12:18:22 +03:00
07bb12ac43 rename db model 2022-02-04 12:16:04 +03:00
1858db9132 rename db model 2022-02-04 12:15:54 +03:00
7fddbbcd93 ApiCore: rename private static fileds by microsoft convention 2022-02-04 11:34:32 +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
4097f72e94 Common: used file-scope namespaces, remove unnecessary 2022-02-03 18:26:44 +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
973624c30b Merge branch 'feature/refactoring' into feature/asc-common-refactor 2022-02-03 17:30:13 +03:00
2f0fce66de cosmetic 2022-02-03 17:18:58 +03:00
bd674080fe refactoring: healthChecks 2022-02-03 17:08:54 +03:00
25504f1d8b refactoring: web.studio 2022-02-03 16:53:42 +03:00
3ad4ba6c08 fix after merge 2022-02-03 16:53:34 +03:00
e6665bb8c9 Merge branch 'feature/refactoring' into feature/asc-audit-trail-refactor 2022-02-03 16:46:17 +03:00
687c2235fb refactoring: webhooks.core: file-scope namespace 2022-02-03 16:43:37 +03:00
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