Commit Graph

97 Commits

Author SHA1 Message Date
d7386049dc Merge branch 'master' into feature/files 2020-06-04 16:27:06 +03:00
b55cc7c697 Startup: added command line 2020-06-04 16:26:31 +03:00
172b8bebfc fix 2020-06-04 16:13:39 +03:00
ae0fb62add Merge branch 'master' into feature/files 2020-06-04 16:05:12 +03:00
794486f335 Notify: temp log 2020-06-04 16:04:17 +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
b0ae0b5270 Merge branch 'master' into feature/files 2020-05-22 15:26:05 +03:00
b6817d18b5 UrlShortenerService: fix 2020-05-22 14:51:03 +03:00
5d5c67ea3c Merge branch 'master' into feature/files 2020-05-21 11:51:09 +03:00
3fadf8db6c fix log, added UrlShortenerService config 2020-05-21 11:03:35 +03:00
02dd1e9e31 Merge branch 'master' into feature/urlshortener
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Common/DependencyInjection/AutofacExtension.cs
2020-05-20 18:18:31 +03:00
1aa1abb768 Merge branch 'master' into feature/files 2020-05-20 16:07:41 +03:00
85cec8fff2 ApiSystem: fix autofac 2020-05-20 16:06:35 +03:00
0705756719 Merge branch 'master' into feature/files 2020-05-19 23:13:51 +03:00
d08a564946 ApiSystem: service, config, di 2020-05-19 20:41:37 +03:00
627dd8a97d ApiSystem: fix 2020-05-19 16:22:47 +03:00
b29b11ad0f Merge branch 'master' into feature/apisystem
# Conflicts:
#	ASC.Web.sln
2020-05-19 14:45:24 +03:00
ea03b6428f fix 2020-05-14 20:39:40 +03:00
8aaf528f2a Elastic: CreateIfNotExist 2020-05-14 17:03:24 +03:00
74e851e01b ElasticSearch: fixed MatchAll 2020-05-08 18:10:53 +03:00
cd70aebb0c Elastic: removed unused classes 2020-05-08 17:04:05 +03:00
7cc06c2322 ElasticSearch: state 2020-05-06 14:32:26 +03:00
f8812bdc05 ElasticSearch: reindex 2020-05-05 20:40:24 +03:00
af7fb87e73 Elastic: settings 2020-05-03 18:50:40 +03:00
7ffd2c702f Files: search 2020-04-29 19:01:38 +03:00
37b126e5cd Files: search 2020-04-29 17:11:31 +03:00
bcfbac05c6 ElastiSearch: removed Wrapper, WrapperWithDoc 2020-04-29 11:04:19 +03:00
adab38548a Files: Index Service 2020-04-28 18:11:10 +03:00
b5671cc460 Files: Service 2020-04-27 19:59:52 +03:00
57f4c3788e ElasticSearch: refactoring. Wrapper replaced with ISearchItem 2020-04-27 14:27:58 +03:00
4db07a6010 ElasticSearch: updated to 7.6.1 2020-04-23 20:24:56 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +03:00
10ec08c08e Partial autofac registration 2020-03-05 17:32:09 +03:00
ef806e6c2b Added url shortener service launcher 2020-03-05 14:55:12 +03:00
67e7f536d1 ASC.ApiSystem: fixed auth header parsing 2020-02-25 15:06:16 +03:00
d44e359f24 ASC.ApiSystem: fixed using 2020-02-25 14:48:14 +03:00
39128a7ba0 ASC.ApiSystem: replace AuthSignatureAttribute with AuthHandler 2020-02-25 14:43:01 +03:00
28d932afff ASC.ApiSystem: added appsettings.services.json 2020-02-25 12:05:27 +03:00
449c0db1fa ASC.ApiSystem: replace HttpResponseMessage to IActionResult 2020-02-25 11:45:16 +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
46cfe9f382 ASC.ApiSystem: AuthSignatureService: using IConfiguration 2020-02-21 12:45:59 +03:00
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
edbb9088b1 ASC.ApiSystem: DI HostedSolution 2020-02-20 17:50:05 +03:00
f83dcbced0 Added ASC.ApiSystem.csproj 2020-02-19 16:19:10 +03:00
7a8baecb2a Files: ef, di 2020-02-19 11:37:52 +03:00
56d5d3f111 Files: Resources, EF 2020-02-18 11:39:28 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
c082019270 Files: DI 2020-02-14 13:45:46 +03:00
efef2f696d Files: DI 2020-02-12 16:50:38 +03:00