Commit Graph

368 Commits

Author SHA1 Message Date
4bad85defe moved from hotfix/10.5.2 2020-01-17 16:58:26 +03:00
ce6dfdf7e0 moved from hotfix/10.5.2 2020-01-17 12:25:22 +03:00
7798898100 moved from hotfix/10.5.2 2020-01-16 21:17:17 +03:00
dd28738907 Settings: Added SendOwnerChangeInstructions and ChangeOwner 2020-01-15 18:22:43 +03:00
e4c1de4494 Core: Common: Fix "Sequence contains more than one matching element" on get TenantQuota 2019-12-26 10:13:09 +03:00
f0434a6546 People: fixed search by text 2019-12-25 18:28:19 +03:00
a8f8b63414 EF: removed old classes 2019-12-23 17:57:21 +03:00
04be312da4 EF: tenants. Use entity 2019-12-23 17:26:38 +03:00
51a9b78749 EF: feed. AddOrUpdate 2019-12-23 16:36:37 +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
496854b0d1 Consumer: rename param name to key 2019-12-23 15:57:09 +03:00
82cc503636 EF: table renamed 2019-12-23 15:41:43 +03:00
26d02ba215 EF: Mail. QuotaError - bool 2019-12-23 15:38:26 +03:00
618a98e077 Merge branch 'feature/ef' of github.com:ONLYOFFICE/AppServer into feature/ef 2019-12-23 15:02:07 +03:00
2097fcdb32 EF: removed comment 2019-12-23 15:01:48 +03:00
fbd6656df6 DI: little twitter fix 2019-12-20 16:07:27 +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
NikolayRechkin
8122eaffdb EF: added check for null 2019-12-19 17:06:18 +03:00
ec3a984e4a EF: notify. fix 2019-12-18 16:10:20 +03:00
fe378e1eef EF: AuditEvent. fix Remove Old Event 2019-12-18 15:24:22 +03:00
f61fb897ac EF: added Dbfunction 2019-12-18 15:22:31 +03:00
f696558445 EF: AddOrUpdate 2019-12-17 16:01:59 +03:00
b2002a08db EF: MultiRegionHostedSolution 2019-12-17 11:27:38 +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
db5f113480 EF: Mail 2019-12-13 14:37:58 +03:00
b3c64af077 EF: files renamed 2019-12-12 18:33:48 +03:00
7ebca49738 EF: MobileAppInstall 2019-12-12 18:24:47 +03:00
a47196dc05 EF: Voip 2019-12-11 17:30:28 +03:00
6cd6eedde0 EF: notify 2019-12-11 12:47:55 +03:00
a4cfdb173c EF: fix 2019-12-10 18:31:37 +03:00
5d7f58cc2c EF: refactoring 2019-12-10 18:06:51 +03:00
aed98bea9a EF: ipRestriction 2019-12-10 17:47:48 +03:00
a623670582 EF: notify 2019-12-10 16:42:29 +03:00
6466aa9fc4 EF: Feed 2019-12-10 13:01:45 +03:00
4dfbdde28e EF: Feed 2019-12-10 11:54:53 +03:00
23838c0401 EF: files, Feed 2019-12-09 14:59:22 +03:00
b349a46649 EF: WebstudioUserVisit 2019-12-06 19:01:12 +03:00
8ad3b1ca1d "DeleteOldEvents" temporary removed 2019-12-06 13:32:10 +03:00
b4e5ac2e80 EF up to 3.1. 2019-12-06 13:31: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
74cb7e9582 EF: MessagingSystem 2019-12-05 11:51:28 +03:00
cb8d7ed191 EF: AccountLinker 2019-12-04 14:40:42 +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
d081c18c76 EF: settings 2019-12-04 12:04:32 +03:00
cbbaf1847c EF: removed DbBaseService 2019-12-03 18:28:27 +03:00
3dc8c87a94 EF: DbTenantService 2019-12-03 18:20:21 +03:00
36098aee2e EF: rename 2019-12-02 15:22:40 +03:00
37449e0221 EF: classes moved to folder 2019-12-02 15:18:42 +03:00
789d756038 EF: Subscription. 2019-12-02 15:04:22 +03:00
7e9a5db79d EF: Quota 2019-12-02 12:12:16 +03:00
7ce2fa22d4 EF: dbAzService 2019-11-29 16:47:05 +03:00
1cb1d2ace9 EF: TariffService 2019-11-29 15:26:53 +03:00
997cfa5fda EF: Updated Dependencies. Optimized logging and userPhotoManager 2019-11-29 12:22:20 +03:00
ae26212d5f EF: Configuration 2019-11-26 18:01:45 +03:00
c02a00f7c7 EF: di, log 2019-11-26 12:31:53 +03:00
e3255fb983 EF: optimization 2019-11-25 16:04:58 +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
e579b124d9 fixed scope 2019-11-15 13:11:40 +03:00
711feca435 fixed scope 2019-11-15 12:28:20 +03:00
fcc4e4605f Common nlog config 2019-11-15 11:47:56 +03:00
190c0a5c48 TimeZoneConverter: fixed NullReferenceException 2019-11-14 16:51:15 +03:00
04464d52ad Add "AddEnvironmentVariables" setting 2019-11-14 12:21:15 +03:00
68bd46ef33 Notify: fixed styler 2019-11-12 16:23:15 +03:00
02663dbf0c Fixed object disposed exception 2019-11-12 13:40:02 +03:00
44d6e6e53d Dependencies updated 2019-11-12 13:28:30 +03:00
d3c696bb9e Common: fixed NullReferenceException 2019-11-12 11:32:24 +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
09406eccf4 renamed InstanseId -> InstanceId, BaseCommonLinkUtilityFactory -> BaseCommonLinkUtilityExtension 2019-11-11 14:22:11 +03:00
3e35efc027 ApiDateTime: removed TenantManager from param 2019-11-11 12:15:18 +03:00
9d2862bf9e Renamed all "*factory" classes to "*Extension"
https://github.com/ONLYOFFICE/AppServer/pull/7#pullrequestreview-314756136
2019-11-11 12:03:49 +03:00
6aeef025ab Storage: Fixed loading config 2019-11-11 11:51:19 +03:00
6ac10fac2f ISettings replaced with ISettingsExt 2019-11-08 18:11:30 +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
89b1a0956a SettingsManager: cache 2019-11-06 11:55:59 +03:00
7a9c490467 Settings: fixed automapper settings 2019-11-05 15:34:00 +03:00
26420fd2b8 DI: Notify 2019-11-05 13:20:00 +03:00
0801877060 DI: ASC.Studio.Notify.
Settings: AutoMapper
2019-11-01 16:56:47 +03:00
0be2995e83 DI: filters and handlers 2019-11-01 12:37:02 +03:00
c54f575c26 DI: StudioNotifyService 2019-11-01 11:49:08 +03:00
9d08727f4c DI: refactoring. ASC.Web.Studio 2019-10-31 17:50:24 +03:00
a35a457f6e DI: refactoring. Web.Api 2019-10-31 16:54:43 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
0bbc383266 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
2019-10-30 11:45:55 +03:00
aae987ebf2 fixed AzRecordCache.proto 2019-10-29 15:26:23 +03:00
8ca3a63e24 DI: refactoring 2019-10-22 19:08:37 +03:00
726ca634e4 Revert "removed ConfigurationManager"
This reverts commit c03be150f4.

ProgressQueue init
2019-10-22 16:48:48 +03:00
c03be150f4 removed ConfigurationManager 2019-10-22 16:30:03 +03:00
78584b78a3 DI: removed LogManager 2019-10-22 14:21:44 +03:00
0dcd2dbc91 Removed CommonServiceProvider 2019-10-21 17:56:35 +03:00
fac39ca6ab Removed HttpContext.Current, DbManagerProxy 2019-10-21 17:44:14 +03:00
53d2aaa4e3 DI: DbManager 2019-10-21 16:50:20 +03:00