Commit Graph

425 Commits

Author SHA1 Message Date
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
e0b5661188 DI: dbManager 2019-10-21 15:52:16 +03:00
e82366a2cd DI: dbManager 2019-10-21 15:33:02 +03:00
247a3b787f DI: DbManager 2019-10-18 17:22:40 +03:00
09881619b8 DI: DbManager 2019-10-18 16:29:24 +03:00
219036d4a4 DI: HttpContext 2019-10-18 11:48:27 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
5ec41ccaff DI: removed appSettings 2019-10-14 11:23:45 +03:00
7c05ba927b DI: KafkaCache 2019-10-11 18:03:03 +03:00
bc4af1b2dc DI: TenantManager 2019-10-11 11:57:35 +03:00
f0e7e2e41b DI: notify 2019-10-11 11:31:21 +03:00
85fe70087e DI: CoreConfiguration 2019-10-10 16:18:12 +03:00
75285dfc69 DI: configuration 2019-10-10 13:59:22 +03:00
42fe613918 DI: configuration 2019-10-10 12:53:58 +03:00
2ebe431c98 DI: configuration 2019-10-10 11:52:21 +03:00
74d8709f62 DI: configuration 2019-10-09 19:08:37 +03:00
515f7de555 DI: Configuration 2019-10-09 18:04:46 +03:00
080a343eb5 DI: AppSettings 2019-10-09 13:09:54 +03:00
Daniil Senkiv
2ed3ee4905 Web.Client/Core: added method of deleting self profile 2019-10-04 07:58:38 +03:00
0e3ad46012 Auth: fix 2019-09-27 19:16:11 +03:00
55138419b4 Confirm: fix auth 2019-09-27 18:53:40 +03:00
5e2823974e DI: configuration 2019-09-27 18:12:13 +03:00
665ed9eb3c Settings: GetPasswordSettings available for everyone
ConfirmAuthHandler: handle ArgumentNullException
2019-09-27 17:03:24 +03:00
c8573b8301 Confirm: fixed invite link 2019-09-27 15:28:51 +03:00
387ce4e9ad DI: configuration 2019-09-27 14:51:09 +03:00
d8fb67f683 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	web/ASC.Web.Api/Controllers/AuthenticationController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
#	web/ASC.Web.Core/Utility/CommonLinkUtility.cs
2019-09-27 13:45:37 +03:00
48b2726d78 Confirm: added uid to activation link 2019-09-27 12:20:10 +03:00
1afcd2442c ConfirmAuthHandler: auth by uid 2019-09-27 12:18:48 +03:00
84ba343460 Auth: added check confirm method 2019-09-26 16:36:53 +03:00
647a7fb2d4 Kafka: fixed onmessage error 2019-09-26 14:53:54 +03:00
22e4d19458 PasswordChange: added userId 2019-09-26 12:15:01 +03:00
710a3f62fa Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-25 18:56:28 +03:00
adc6dc801e Notify: fixed textile 2019-09-25 17:25:28 +03:00
2564a0c760 fixed start services 2019-09-25 15:55:35 +03:00
4aac6be6ab fixed start services 2019-09-25 15:49:21 +03:00
680f7ed84b ResxManager: fix 2019-09-24 19:20:21 +03:00
515ce6dae5 People: fixed filter method 2019-09-24 15:51:03 +03:00
6d815608a0 ConfirmAuth: PasswordChange 2019-09-24 15:27:13 +03:00
afb1f90e9a .net core up to 3.0.0 2019-09-24 14:20:58 +03:00
d5e391b89a Core: Fixed UserExists 2019-09-24 13:54:29 +03:00
dec4bb266e DI: configuration 2019-09-24 13:32:12 +03:00
00849598f0 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	products/ASC.People/Server/Controllers/GroupController.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-23 19:27:36 +03:00
23c00b458b Auth: added additional roles 2019-09-23 18:36:22 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
3e0f946372 DI: PathUtils 2019-09-21 19:39:17 +03:00
1e946b19b6 DI: refactoring 2019-09-20 18:53:27 +03:00
8184492a4f DI: ConfigurationManager 2019-09-20 18:08:45 +03:00
f992e1a763 DI: IConfiguration 2019-09-20 17:21:41 +03:00
e7b7cabdd2 DI: TenantManager 2019-09-20 17:04:06 +03:00
41b4a909cd DI: TenantManager 2019-09-20 15:47:00 +03:00
7bb42748b7 DI TenantManager 2019-09-20 15:20:03 +03:00
0e10323e30 BaseCommonLinkUtility optimization 2019-09-20 12:30:27 +03:00
e13049c21f DI: CommonLinkUtility 2019-09-19 18:55:44 +03:00
409da28d4b DI: SubscriptionManager 2019-09-19 16:43:28 +03:00
db5dc66217 Kafka: fix 2019-09-19 15:48:37 +03:00
7ceb117690 DI: CoreConfiguration 2019-09-19 14:34:54 +03:00
a07cbe30f4 DI: CoreSettings 2019-09-18 18:19:30 +03:00
4489d01b82 DI: PaymentManager, AuthorizationManager 2019-09-18 17:18:44 +03:00
6ab71a7b65 DI: tenantManager 2019-09-18 16:33:01 +03:00
2f5fe4301e DI: TenantManager 2019-09-18 15:14:15 +03:00
c171e2c903 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
#	common/ASC.IPSecurity/ASC.IPSecurity.csproj
#	common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
#	common/ASC.VoipService/ASC.VoipService.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/ASC.Web.Core.csproj
#	web/ASC.Web.Studio/ASC.Web.Studio.csproj
2019-09-18 13:32:39 +03:00
152c5d9697 .net core up to 3.0.0-rc1 2019-09-18 12:29:17 +03:00
bcdbcf5ccc DI: TenantManager 2019-09-18 11:25:57 +03:00
f34dca4ebb DI: ApiDateTime 2019-09-17 18:38:06 +03:00
4e2c04c9f7 DI: TenantManager 2019-09-17 15:42:32 +03:00
a46a092890 DI: TenantManager 2019-09-17 11:07:46 +03:00
547e589420 Removed TenantProvider 2019-09-16 17:51:39 +03:00
de16476542 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
2019-09-16 15:35:44 +03:00
86c5e64b20 added AuthByClaim 2019-09-16 12:21:10 +03:00
473207f9a4 DI: BaseSettings 2019-09-13 14:18:27 +03:00
deb8231f26 revert f85711b736 2019-09-12 14:34:58 +03:00
e0cb81adc4 Merge branch 'master' into refactoring/di
# Conflicts:
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-11 21:21:21 +03:00
1530ec842e DI: WebImageSupplier,WebItemSettings, SettingsManager 2019-09-11 13:42:52 +03:00
c34db98d6b suppress warning: NU1701 for release configuration 2019-09-10 18:20:17 +03:00
a91ea0ee67 BaseSettings: DI 2019-09-10 17:29:37 +03:00
cc135070ea SecurityProtocolType.Ssl3' is obsolete. Removed 2019-09-10 16:42:36 +03:00
c50b5b0fc9 csproj: remove pdb file from release build configuration 2019-09-10 16:38:20 +03:00
22bc8d1ad7 ConfirmAuthHandler di 2019-09-10 16:31:03 +03:00
7cd8e53d2c Merge branch 'master' into refactoring/di 2019-09-10 16:15:15 +03:00
02efce033f Api: added confirm auth scheme 2019-09-10 15:42:15 +03:00
0a5ef37043 Getting STORAGE_ROOT from env variable 2019-09-09 18:04:28 +03:00
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00
82d331f633 People: fix cache 2019-09-03 14:31:51 +03:00
a26d8d24ce Api: added CustomJsonOptionsWrapper. optimization 2019-09-03 12:31:15 +03:00
967068a728 UserInfo: optimization 2019-09-02 18:09:45 +03:00
12747318c6 Optimization 2019-08-30 15:40:57 +03:00
47e693c5e3 Kafka: guid as bytes 2019-08-28 15:58:53 +03:00
795dc8665a Kafka: added key to message 2019-08-28 14:14:09 +03:00
fa6e8ab647 Optimization 2019-08-28 12:15:33 +03:00
d16d5f1251 Kafka: create only one producer for instance
UserPhotoManager: optimization
2019-08-27 17:57:06 +03:00
68032bdc85 Added Textile launcher 2019-08-23 15:50:08 +03:00
6cae722b9d kafka disabled by default 2019-08-23 15:49:23 +03:00
c52b8e0a14 ResourceManager: check fixed 2019-08-23 14:27:18 +03:00
ff1c3ac32e NotifyItem: change type of Recipient.Name 2019-08-23 12:25:54 +03:00
39bac7cc64 Notify: name removed 2019-08-22 18:59:49 +03:00
0c4b70e208 ApiDateTime: fix ReadJson 2019-08-22 16:41:13 +03:00
baf4c8c819 NotifyTemplateResource 2019-08-19 18:48:49 +03:00
fd3a2e8e8f ASC.Common: format 2019-08-19 17:27:32 +03:00
8c8b844a70 Added ASC.Notify.Textile 2019-08-19 16:51:36 +03:00
e274a018ae added ASC.Textile 2019-08-19 15:35:39 +03:00
8c49db565f ca1507 2019-08-16 13:15:25 +03:00
0bd089938e IDE0059 2019-08-16 12:08:46 +03:00
73774a29fa IDE0067 2019-08-16 11:44:03 +03:00
28fc76ded9 IDE0066 2019-08-15 18:13:25 +03:00
9e32ad4b6c IDE0063 2019-08-15 18:08:40 +03:00
ddf7c8ddcd IDE0054, IDE0056, IDE0057, IDE1005 2019-08-15 17:48:55 +03:00
3cd4131f21 IDE0039, IDE0041, IDE0044 2019-08-15 17:36:08 +03:00
f747e0e4fc IDE0028, IDE0016, IDE0029, IDE0032 2019-08-15 16:56:54 +03:00
b426004f70 IDE0019, IDE0020 2019-08-15 16:41:38 +03:00
96dd3cd657 IDE0017 2019-08-15 16:35:18 +03:00
3636df7a24 IDE0031 2019-08-15 16:28:29 +03:00
c7d163b37d IDE0016 2019-08-15 16:20:23 +03:00
ed7ed484e8 IDE0049 2019-08-15 16:16:39 +03:00
d9be7211f6 IDE0018 2019-08-15 16:05:50 +03:00
58fb60ba65 IDE0007 2019-08-15 16:03:57 +03:00
f8f2c94962 IDE0034 2019-08-15 16:00:20 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
3ebea6f0bc ResourceManager: fix 2019-08-15 14:52:47 +03:00
2a8adce631 ResourceManager: fixed 2019-08-15 14:40:44 +03:00
65563552fa Packages updated 2019-08-15 14:33:57 +03:00
14e995a7ec fix 2019-08-15 12:23:59 +03:00
234c77419f ResourceManager: check exist 2019-08-15 12:14:10 +03:00
ddfbab4c24 Resources: notify 2019-08-15 11:44:27 +03:00
96118df5bb People: fix 2019-08-14 15:12:48 +03:00
acb990ca87 ResxManager: export file 2019-08-13 18:17:14 +03:00
e031a89385 ResxManager: fixed 2019-08-13 16:03:56 +03:00
b6937c987b CultureMiddleWare: fixed 2019-08-13 16:01:03 +03:00
1ad30a247f Resource.Manager: added ResxManager 2019-08-13 14:17:18 +03:00
731ddefc82 Added CultureMiddleware and DisposeMiddleware 2019-08-12 15:52:55 +03:00
d524663958 Packages updated 2019-08-12 15:52:09 +03:00
a26a6db0ea Api: added settings controller 2019-08-12 13:53:12 +03:00
49b259abff refactoring 2019-08-09 15:28:19 +03:00
f0d2854071 People: fix search by filter 2019-08-08 17:42:29 +03:00
6f8a94dca4 Optimization 2019-08-08 16:35:22 +03:00
f7327b0c79 Api: limit removed 2019-08-08 16:34:25 +03:00
f85711b736 Optimization 2019-08-08 12:26:58 +03:00
f9fe6c800b People: fix search by employeeStatus 2019-08-06 12:37:00 +03:00
e9c564fda9 People: method "get by filter" optimized 2019-08-05 16:45:33 +03:00
52a9770f5c Core: fix 2019-08-05 15:24:26 +03:00
8a4807daaa Api: fix 2019-08-05 10:50:11 +03:00
1de8fd7398 Api: fields 2019-08-02 17:40:33 +03:00
00120d88c9 Notify: sender queue moved to ASC.Studio.Notify 2019-08-02 13:25:33 +03:00
807378d216 Notify: refactoring 2019-08-01 14:44:50 +03:00
79569f7e7a Notify: fix 2019-08-01 14:08:35 +03:00