Commit Graph

1123 Commits

Author SHA1 Message Date
1d4cabe5b9 MessagesRepository: optimization 2021-08-10 17:57:20 +03:00
57493d1018 Logger: singletone 2021-08-10 17:56:59 +03:00
643b7b66dc Optimization: removed autofac ILifetimeScope 2021-08-10 17:56:38 +03:00
39f77c5352 Backup: fix 2021-08-10 11:36:07 +03:00
44847c1e8f backend: change TargetFramework from netstandard2.1 to net5.0 2021-08-06 18:37:22 +03:00
90bb8a139a UserManager: fix for personal 2021-08-06 17:30:51 +03:00
e86124cbdd Elastic: fixed search by content 2021-08-04 13:08:12 +03:00
6fbdaf0d31 Calendar: post-merge fixes 2021-07-27 16:09:30 +03:00
f1668a3b43 Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
d821f9a2af TimeZone: fix 2021-07-22 22:40:37 +03:00
913c67a818 Elastic: fixed create scope 2021-07-22 12:11:39 +03:00
8c78fa4a17 Feed: fix TenantManager 2021-07-22 11:56:52 +03:00
1268a436ca Startup: fix load products 2021-07-16 11:56:14 +03:00
d88741962c EF: optimize server version check 2021-07-16 11:48:30 +03:00
2d75554b0d DbContext: optimization 2021-07-15 13:07:47 +03:00
b184ad7898 Log: fix configuring 2021-07-14 11:00:59 +03:00
ad57feecd8 Log: fix configuring 2021-07-13 21:17:18 +03:00
8388a4e306
Merge branch 'develop' into feature/personal 2021-07-12 10:56:30 +03:00
7e6e25274f Api: fix confirm 2021-07-10 20:27:15 +03:00
a31dc583c1 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Settings/index.js
2021-07-02 16:26:45 +03:00
b6b1c72769 core: added new ThenBy linq extension. crm: fixed sql 2021-06-30 19:08:41 +03:00
fbcdba3b17 Merge branch 'develop' into feature/personal 2021-06-25 11:10:49 +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
6118e95028 Merge branch 'develop' into feature/personal 2021-06-17 14:25:09 +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
65378cc089 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.CRM/Client/public/index.html
#	products/ASC.Calendar/Client/public/index.html
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Mail/Client/public/index.html
#	products/ASC.People/Client/public/index.html
#	products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/public/index.html
2021-06-15 11:49:39 +03:00
a66e3afa92 Web: Tests: Commented "Save empty 'EN' keys to not found files" 2021-06-11 18:18:38 +03:00
bac090e180 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-11 13:11:08 +03:00
fc9d626bcc UrlShortenerService: fix log 2021-06-11 11:44:10 +03:00