Commit Graph

163 Commits

Author SHA1 Message Date
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
e10ac2ccfa BaseStartup: refactoring 2020-07-15 15:33:44 +03:00
SuhorukovAnton
9d069de30a general-startup: transform GeneralStartup to BaseStartup 2020-07-07 23:00:39 +03:00
SuhorukovAnton
00558dd95f general-startup: fix 2020-07-06 10:56:17 +03:00
SuhorukovAnton
71d90ebfa2 general-startup: fix 2020-07-03 18:57:59 +03:00
SuhorukovAnton
2f5491f1ba general-startup: first version 2020-07-03 14:47:27 +03:00
635ff124fb Json: fixed enum 2020-06-05 14:05:42 +03:00
fed4d206f7 Revert logger 2020-06-04 16:46:58 +03:00
b55cc7c697 Startup: added command line 2020-06-04 16:26:31 +03:00
794486f335 Notify: temp log 2020-06-04 16:04:17 +03:00
e7ecaefa3c Added JsonStringEnumConverter 2020-05-27 16:19:58 +03:00
ecd66902a0 Merge branch 'master' into feature/system-json 2020-05-18 14:16:03 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +03:00
3a747ef8e4 Merge branch 'master' into feature/system-json
# Conflicts:
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Api.Core/Core/ApiDateTime.cs
#	common/ASC.Api.Core/Model/EmployeeWraper.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Models/GroupWrapperFull.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Models/BuildVersion.cs
2020-05-07 10:28:20 +03:00
35e2e20049 Files: added model 2020-02-25 15:21:48 +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
a90b1fb424 People: added GetExpression 2020-02-25 11:02:13 +03:00
9db8b26985 Replaced NewtonsoftJson with System.Text.Json 2020-02-21 16:19:32 +03:00
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
7a8baecb2a Files: ef, di 2020-02-19 11:37:52 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
4bad85defe moved from hotfix/10.5.2 2020-01-17 16:58:26 +03:00
48e56d462a Api: people. Fixed "Sequence contains no elements" error while saving empty contacts list 2019-12-27 13:19:35 +03:00
aea429a0ad Api: people. Fixed saving contacts 2019-12-25 18:16:29 +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
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
2758fb1dfb Merge branch 'master' into feature/ef 2019-12-12 17:53:54 +03:00
NikolayRechkin
ca5e501e2b Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-12-09 16:08:48 +03:00
NikolayRechkin
94581bdd39 People: deleted unused code 2019-12-09 15:59:34 +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
a047332f9c Merge branch 'master' into feature/ef 2019-12-04 13:42:31 +03:00
ea60dbe63f DI: AccountLinker 2019-12-04 13:39:18 +03:00
3dc8c87a94 EF: DbTenantService 2019-12-03 18:20:21 +03:00
997cfa5fda EF: Updated Dependencies. Optimized logging and userPhotoManager 2019-11-29 12:22:20 +03:00
538511a4dc EF: options 2019-11-25 14:49:21 +03:00
3586867429 EF: DbUserService 2019-11-25 12:49:12 +03:00
d05565107c EF: init commit 2019-11-15 18:04:05 +03:00
fcc4e4605f Common nlog config 2019-11-15 11:47:56 +03:00
04464d52ad Add "AddEnvironmentVariables" setting 2019-11-14 12:21:15 +03:00
175c86fb49 People: auth fixed 2019-11-13 18:11:30 +03:00
074b8b7f61 People: optimized get all people method 2019-11-12 15:24:59 +03:00
26c8d56219 DI: refactoring. Added EmployeeWraperHelper 2019-11-11 18:42:07 +03:00
e9b6976187 Renamed all "*factory" classes to "*Extension" 2019-11-11 14:50:46 +03:00
32781a87e2 DI: refactoring. Extract settings helpers 2019-11-08 15:21:51 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
0be2995e83 DI: filters and handlers 2019-11-01 12:37:02 +03:00