Commit Graph

5971 Commits

Author SHA1 Message Date
5eed00dd28 Removed sq bugs and code smells 2020-10-16 16:21:59 +03:00
e6be6f5072 References updated 2020-10-16 10:27:44 +03:00
f69281a07d References updated 2020-10-15 21:30:16 +03:00
b59a5a5069
Merge pull request #92 from ONLYOFFICE/features/ASC.AuditTrail
Features/asc.audit trail
2020-10-15 11:42:38 +03:00
cb896530b7 Merge branch 'master' into features/ASC.AuditTrail 2020-10-15 11:34:37 +03:00
0405989167 LoginEvents: fix 2020-10-15 11:04:06 +03:00
0631da043b extract build.sln.bat 2020-10-14 18:24:39 +03:00
7a535d9654 Audit: public resources 2020-10-14 17:15:30 +03:00
c1b046f954 Audit: resources. refactoring 2020-10-14 16:58:53 +03:00
aa28276de7 AuditTrail: resource 2020-10-14 16:43:51 +03:00
bdcfcd697b Audit: fix 2020-10-14 16:27:12 +03:00
d50cf081ba Merge branch 'master' into features/ASC.AuditTrail 2020-10-14 13:02:30 +03:00
d41b12cdc8 DbTenant: fix 2020-10-14 12:59:37 +03:00
4a0a683c68 fix 2020-10-14 12:11:04 +03:00
15e0df7950 Sln: fix 2020-10-13 18:25:13 +03:00
f252ef2a7f Merge branch 'master' into features/ASC.AuditTrail
# Conflicts:
#	ASC.Web.sln
2020-10-13 18:17:59 +03:00
18aad95bf0
Merge pull request #97 from ONLYOFFICE/feature/remove-FileOperationsManagerHelper
remove-FileOperationsManagerHelper: first version
2020-10-13 18:06:59 +03:00
5c42b9d04e Merge branch 'master' into feature/remove-FileOperationsManagerHelper 2020-10-13 15:50:51 +03:00
788bddeb4f Studio: fix 2020-10-13 15:26:54 +03:00
ca8c5625e2
Merge pull request #96 from ONLYOFFICE/feature/fix_API_return
fix_API_return: first version
2020-10-13 14:06:48 +03:00
9968873305 Merge branch 'master' into feature/fix_API_return
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2020-10-13 13:33:24 +03:00
9a2fde062d
Merge pull request #86 from ONLYOFFICE/feature/fix-messages
Feature/fix messages
2020-10-13 11:28:46 +03:00
a1bcf2eb3e Merge branch 'master' into feature/fix-messages 2020-10-13 11:28:19 +03:00
b1d50e5702 Core: fix DI 2020-10-13 11:26:17 +03:00
65fd5ee2f3 Api: fix DI 2020-10-13 11:13:24 +03:00
fb5a6b9926 Api: fix DI 2020-10-13 11:11:03 +03:00
bead971061 Api: fix DI 2020-10-13 11:09:22 +03:00
b4a0a302e6 Files: fix di 2020-10-13 10:28:13 +03:00
cefc64422e Files: fix di 2020-10-13 10:23:53 +03:00
ae8fd12b35 Files: fix di 2020-10-13 10:21:02 +03:00
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
5e11f96a0c fix 2020-10-12 22:15:27 +03:00
a8b838b4ce fix 2020-10-12 22:12:03 +03:00
beeeaf3c3d fix 2020-10-12 20:43:31 +03:00
f6f65f5968 fix 2020-10-12 20:40:14 +03:00
5e14bbb8cc fix 2020-10-12 20:20:19 +03:00
43b9c33979 fix formating 2020-10-12 19:23:15 +03:00
383478d3bd fix 2020-10-12 19:13:51 +03:00
26bb1567f7 ProductSecurityFilter: fix 2020-10-12 19:00:04 +03:00
b120d801aa Confirm: fix 2020-10-12 18:58:38 +03:00
6f23d92ee8 editorconfig 2020-10-12 18:50:36 +03:00
36034bf97a fix warnings 2020-10-12 16:52:31 +03:00
a3f36c2796 Nginx: fix 2020-10-12 12:22:23 +03:00
344acefa9b Files: fix filter 2020-10-12 11:26:15 +03:00
SuhorukovAnton
5e6ad050ab Merge branch 'master' into feature/fix-messages 2020-10-12 10:43:19 +03:00
SuhorukovAnton
917493f397 fix-messages: IDE0058 2020-10-10 14:35:05 +03:00
SuhorukovAnton
f4c0515340 fix-messages: IDE0022 2020-10-10 13:01:09 +03:00
bd822fedd0 ds-vpath rewrite 2020-10-09 22:40:06 +03:00
9c7e979494 Config: internal path 2020-10-09 20:59:56 +03:00
26ac508aef Config: internal path 2020-10-09 20:41:26 +03:00