Commit Graph

1092 Commits

Author SHA1 Message Date
b6b1c72769 core: added new ThenBy linq extension. crm: fixed sql 2021-06-30 19:08:41 +03:00
37a676cb5a Tenant: removed Public, PublicVisibleProducts 2021-06-24 15:55:12 +03:00
a23b23de3c Startup: added ability to skip load products and consumers 2021-06-24 11:15:20 +03:00
d41f81e1cd Merge branch 'develop' into feature/remove_binary_formatter 2021-06-23 20:27:10 +03:00
d59f9a2aa2 fixed urls 2021-06-23 20:12:50 +03:00
0e6078f9e2 Merge branch 'develop' into feature/ClearEvents
# Conflicts:
#	ASC.Web.sln
2021-06-23 17:15:56 +03:00
20d1f9a738 merge from develop 2021-06-23 16:10:46 +03:00
85574630cb Merge branch 'develop' into feature/ClearEvents 2021-06-23 15:30:55 +03:00
c18adc50dc ClearEvents: fixed log and launch 2021-06-23 15:25:17 +03:00
7fc9a35b49 Merge branch 'develop' into dependabot/npm_and_yarn/common/ASC.Socket.IO/redis-3.1.1 2021-06-23 14:37:03 +03:00
3788bab48e HealthCheck: fix Studio 2021-06-22 19:55:47 +03:00
d8abde6d88 SSoAuth: fix buid and run 2021-06-22 19:44:09 +03:00
912501a2f4 Healthcheck: fix apisystem 2021-06-22 19:09:24 +03:00
4a4cab5352 Files: FileHelper decorator 2021-06-18 23:31:46 +03:00
00cc15fbf5 Merge branch 'develop' into feature/ClearEvents 2021-06-18 12:21:54 +03:00
d0b813cc71 update packages 2021-06-18 12:11:25 +03:00
d3113fdc2e Merge branch 'develop' into dependabot/npm_and_yarn/common/ASC.Socket.IO/redis-3.1.1 2021-06-18 11:32:55 +03:00
3d3a8a2d6a Merge branch 'develop' into feature/remove_binary_formatter 2021-06-18 10:49:07 +03:00
8fc9bef6c6 Core: fix cache 2021-06-16 22:25:02 +03:00
01639a56cc RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
2021-06-16 20:08:26 +03:00
53ee0ef484 fixed warnings 2021-06-16 18:00:27 +03:00
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
2021-06-16 17:02:46 +03:00
5fcbdbd7dd added health checks 2021-06-16 16:54:36 +03:00
73547f421e Common: install newtonsoft 2021-06-15 16:44:53 +03:00
a66e3afa92 Web: Tests: Commented "Save empty 'EN' keys to not found files" 2021-06-11 18:18:38 +03:00
fc9d626bcc UrlShortenerService: fix log 2021-06-11 11:44:10 +03:00
a82efce2a1 add fileHelper 2021-06-10 17:53:06 +03:00
8d80955686 Thumbnail: fix 2021-06-09 15:04:29 +03:00
c5fe4a9989 Merge branch 'develop' into feature/ClearEvents 2021-06-08 12:17:36 +03:00
b925943cb6 merge from develop 2021-06-07 17:23:25 +03:00
50f0bef484 remove unnecessary using 2021-06-07 13:56:24 +03:00
fd485e06e4 remove_binary_formatter 2021-06-07 13:54:17 +03:00
54d5c658bd
Merge branch 'develop' into feature/two-factor-auth 2021-06-07 11:54:06 +03:00
SuhorukovAnton
860b682594 replace "DeleteOldEvents" in new service 2021-06-04 14:10:37 +03:00
e8516f7b34
Merge branch 'develop' into feature/two-factor-auth 2021-06-03 20:27:57 +03:00
944966b67b WebSocker: repair service 2021-06-03 16:13:22 +03:00
43de25b62a Merge branch 'develop' into feature/remove-unused-dep
# Conflicts:
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00
bcc9e6c34b ResManager: additional feature 2021-06-03 12:48:25 +03:00
ceb19659f3
Merge pull request #264 from ONLYOFFICE/feature/thirdparty_for_two_frameworks
Feature/thirdparty for two frameworks
2021-06-03 12:19:27 +03:00
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth 2021-06-02 23:57:00 +03:00
0aa6a71ea8 Merge branch 'develop' into feature/translations 2021-06-02 14:05:43 +03:00
e9c5ca41ae fix 2021-06-02 11:26:58 +03:00
95dbfb8c5c Merge branch 'develop' into feature/translations 2021-06-01 20:02:48 +03:00
72f27e9b55 Web: Tests: Added new NotTranslatedToastsTest() 2021-06-01 20:00:36 +03:00
SuhorukovAnton
7fd550dfe8 Merge branch 'develop' into feature/thirdparty_for_two_frameworks 2021-06-01 17:49:10 +03:00
3ca36c9dd2 Web: Tests: Added new Common translations; 2021-06-01 17:00:55 +03:00
23e1083be7 Web: Removed empty translations keys 2021-06-01 13:49:37 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
424ea1396b Web: Tests: Added opportunity to apply new Common translations 2021-06-01 11:44:46 +03:00
353fda6ff8 Web: Tests: Added opportunity to apply new translations 2021-06-01 11:29:46 +03:00