Commit Graph

153 Commits

Author SHA1 Message Date
57454bae0c References updated 2020-06-28 16:55:21 +03:00
d53b11967a Merge branch 'master' into feature/backup 2020-06-25 15:37:53 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
725955e851 ProgressQueue: fix 2020-06-08 12:44:01 +03:00
f59be0f44b Merge branch 'master' into feature/backup 2020-06-04 17:12:34 +03:00
fed4d206f7 Revert logger 2020-06-04 16:46:58 +03:00
794486f335 Notify: temp log 2020-06-04 16:04:17 +03:00
4ea72a0e65 Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
2020-06-04 14:39:40 +03:00
1c25d16fc2 Products: added absolute path support 2020-06-04 14:01:25 +03:00
SuhorukovAnton
89368aed8b Backup: refactoring 2020-06-03 12:15:05 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
3fadf8db6c fix log, added UrlShortenerService config 2020-05-21 11:03:35 +03:00
SuhorukovAnton
6acb0d4208 creating 2020-05-20 18:14:44 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
78442cd9eb Files: Service fix 2020-05-15 14:02:05 +03:00
02b33bc07b Merge branch 'master' into feature/files-index
# Conflicts:
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
2020-05-06 11:54:26 +03:00
1526d8e502 Common: removed StreamCopyTo 2020-05-06 11:41:27 +03:00
af7fb87e73 Elastic: settings 2020-05-03 18:50:40 +03:00
37b126e5cd Files: search 2020-04-29 17:11:31 +03:00
623a6609cc JWT: fix 2020-04-24 13:28:06 +03:00
4f025d9931 Files: fixed download 2020-04-23 14:50:34 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +03:00
1b0784e3cf Files: updated JWT 2020-04-16 16:07:30 +03:00
e986f73293 Files: fixed ComposeFileOperation 2020-03-20 11:11:38 +03:00
5671ee6133 Files: fixed long operation 2020-03-06 17:48:58 +03:00
c780a881df Files: fixed removing file method 2020-03-04 10:42:43 +03:00
44ec45ebb6 Merge branch 'master' into feature/elastic
# Conflicts:
#	common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Caching/CachedQuotaService.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/AuthManager.cs
#	common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Core.Common/Data/DbSettingsManager.cs
#	common/ASC.Core.Common/Tenants/TenantUtil.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2020-02-25 11:24:45 +03:00
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +03:00
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
fbce5f3845 DI: HostedSolution 2020-02-20 11:05:10 +03:00
7a8baecb2a Files: ef, di 2020-02-19 11:37:52 +03:00
45266f6647 DIHelper: fixed configure method 2020-02-17 15:13:40 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
efef2f696d Files: DI 2020-02-12 16:50:38 +03:00
3fa9046bec Merge branch 'master' into feature/elastic 2020-02-11 14:08:26 +03:00
1291be98e3 Autofac: fix 2020-02-11 13:47:04 +03:00
96687f4fa6 Files: DI 2020-02-07 14:34:25 +03:00
8c2b39406f Merge branch 'master' into feature/merge 2020-02-03 14:29:41 +03:00
7a9b02abdb TreatWarningsAsErrors=false 2020-02-03 14:27:41 +03:00
f017d9cc23 fix from review 2020-02-03 13:48:06 +03:00
7798898100 moved from hotfix/10.5.2 2020-01-16 21:17:17 +03:00
a8f8b63414 EF: removed old classes 2019-12-23 17:57:21 +03:00
2782d9f64c Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	common/ASC.VoipService/Dao/VoipDao.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2019-12-23 16:25:33 +03:00
65870f460b Removed unused elements 2019-12-20 14:27:03 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
04d8bf05eb EF: MultiRegionalDbManager 2019-12-16 17:55:59 +03:00
f0f6b0a299 EF: resourceManager 2019-12-16 12:30:01 +03:00
08c98691d5 EF: GeolocationHelper 2019-12-13 16:05:24 +03:00
08db3b32b3 Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
2019-12-06 12:25:18 +03:00
c9939b0da1 .net core up to 3.1 2019-12-06 12:12:51 +03:00