Commit Graph

71 Commits

Author SHA1 Message Date
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
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
SuhorukovAnton
456866d4d9 scope: refactoring 2020-07-30 00:57:58 +03:00
d094546147 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
2020-07-17 17:48:50 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
88e932a0a7 Merge branch 'master' into feature/files 2020-07-13 16:46:42 +03:00
dfd8bbfdb8 Merge branch 'master' into feature/api-defaultvalue 2020-07-13 15:28:11 +03:00
cd3240a7f6 Removed LimitedConcurrencyLevelTaskScheduler 2020-07-13 14:11:36 +03:00
5988855b61 Fix License 2020-07-08 18:30:23 +03:00
SuhorukovAnton
8b5ab8c9a4 api-defaultvalue: delete DataContracts 2020-07-08 13:10:09 +03:00
87f85fdefe Merge branch 'master' into feature/files 2020-06-29 09:53:07 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
Ilya Oleshko
99e641bb2f Merge branch 'master' into feature/files 2020-06-03 18:53:04 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
ea03b6428f fix 2020-05-14 20:39:40 +03:00
8aaf528f2a Elastic: CreateIfNotExist 2020-05-14 17:03:24 +03:00