Commit Graph

86 Commits

Author SHA1 Message Date
d9619e1151 analizators/U2U1006 2022-01-10 18:13:54 +03:00
6273539207 analizators/s2583 2021-12-30 14:03:50 +03:00
c87a831b89 Files: optimization 2021-12-08 13:14:44 +03:00
8ca88e4620 Merge branch 'develop' into feature/net6
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
2021-11-23 16:40:50 +03:00
1882f9db43 Fixed settings issue 2021-10-29 17:21:51 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
1bc64ce5ae Files: check state before get stream 2021-09-30 09:51:38 +03:00
9cb01be544 Elastic: removed unused isInit 2021-09-03 18:05:05 +03:00
b791586252 net6 2021-08-25 18:26:13 +03:00
e5faa90adb removed nuget warnings 2021-08-20 16:53:27 +03:00
643b7b66dc Optimization: removed autofac ILifetimeScope 2021-08-10 17:56:38 +03:00
44847c1e8f backend: change TargetFramework from netstandard2.1 to net5.0 2021-08-06 18:37:22 +03:00
e86124cbdd Elastic: fixed search by content 2021-08-04 13:08:12 +03:00
913c67a818 Elastic: fixed create scope 2021-07-22 12:11:39 +03:00
2d75554b0d DbContext: optimization 2021-07-15 13:07:47 +03:00
53ee0ef484 fixed warnings 2021-06-16 18:00:27 +03:00
1b730233c9 ElasticSearch: moved from 08a01422 2021-05-23 19:11:25 +03:00
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
ae69a9559e Files: removed temp 2021-01-13 12:41:29 +03:00
f6ca373137 MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
79ea471098 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Core.Common/BaseCommonLinkUtility.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Migration/Program.cs
#	common/services/ASC.Notify/NotifyServiceLauncher.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Socket.IO.Svc/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Thumbnails.Svc/Program.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-11-04 15:22:43 +03:00
7e828b5643 Autofac: fix 2020-11-02 19:27:08 +03:00
75bbe888cd Scope: refactoring. Migration, ASC.Files.Service 2020-10-26 19:38:23 +03:00
367c93fd91 Refactoring: scope 2020-10-22 20:57:18 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
a4eb45f1ab Scope: refactoring 2020-10-18 19:03:14 +03:00
18ef6e7cb6 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-10-16 16:57:21 +03:00
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
02f39a9c71 Merge branch 'master' into feature/files
# Conflicts:
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	web/ASC.Web.Core/Files/FileUtility.cs
2020-10-13 12:52:28 +03:00
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
a8b838b4ce fix 2020-10-12 22:12:03 +03:00
36034bf97a fix warnings 2020-10-12 16:52:31 +03:00
SuhorukovAnton
ba1ed22345 fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
SuhorukovAnton
754ac38e3e fix-messages: IDE0074 2020-09-29 12:18:16 +03:00
SuhorukovAnton
2d34d70a4e fix-messages: IDE0051 and IDE0052 2020-09-29 11:57:37 +03:00
SuhorukovAnton
d866eccade fix-messages: IDE0044 2020-09-28 18:42:03 +03:00
SuhorukovAnton
1d7f54ca22 fix-messages: IDE0019 2020-09-28 17:39:13 +03:00
SuhorukovAnton
bc98087599 fix-messages: IDE0018 2020-09-28 17:25:40 +03:00
TatianaLopaeva
a3adea3c27 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-09-15 17:39:34 +03:00
15b34875d3 Moved from v10.5.2-saas 2020-09-11 17:12:35 +03:00
23b2a310a0 Merge branch 'master' into feature/files 2020-09-10 12:35:55 +03:00
SuhorukovAnton
80198032a4 scope: refactoring 2020-09-07 15:01:15 +03:00
SuhorukovAnton
132a6b05ae scope: add deconstructs 2020-08-31 11:18:07 +03:00
SuhorukovAnton
055e787d63 scope: fix 2020-08-24 21:41:06 +03:00
15ba6828c5 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-08-20 12:43:12 +03:00
SuhorukovAnton
faec4269db Merge branch 'master' into feature/scope 2020-08-16 12:23:20 +03:00