|
|
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 |
|
|
|
04d8bf05eb
|
EF: MultiRegionalDbManager
|
2019-12-16 17:55:59 +03:00 |
|
|
|
08c98691d5
|
EF: GeolocationHelper
|
2019-12-13 16:05:24 +03:00 |
|
|
|
db5f113480
|
EF: Mail
|
2019-12-13 14:37:58 +03:00 |
|
|
|
7ebca49738
|
EF: MobileAppInstall
|
2019-12-12 18:24:47 +03:00 |
|
|
|
2758fb1dfb
|
Merge branch 'master' into feature/ef
|
2019-12-12 17:53:54 +03:00 |
|
|
|
a47196dc05
|
EF: Voip
|
2019-12-11 17:30:28 +03:00 |
|
|
|
6cd6eedde0
|
EF: notify
|
2019-12-11 12:47:55 +03:00 |
|
|
|
a623670582
|
EF: notify
|
2019-12-10 16:42:29 +03:00 |
|
|
|
647333b3c2
|
EF: feed
|
2019-12-10 12:05:28 +03:00 |
|
|
|
33c35b1177
|
Merge branch 'master' into feature/ef
|
2019-12-09 21:46:43 +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 |
|
|
|
d187c8c82b
|
UserPhotoManager: fixed SearchInCache
|
2019-12-09 15:49:36 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
711feca435
|
fixed scope
|
2019-11-15 12:28:20 +03:00 |
|
|
|
68bd46ef33
|
Notify: fixed styler
|
2019-11-12 16:23:15 +03:00 |
|
|
|
44d6e6e53d
|
Dependencies updated
|
2019-11-12 13:28:30 +03:00 |
|
|
|
a3bee291a2
|
Added comments
|
2019-11-11 18:45:17 +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 |
|
|
|
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 |
|
|
|
0801877060
|
DI: ASC.Studio.Notify.
Settings: AutoMapper
|
2019-11-01 16:56:47 +03:00 |
|
|
|
c54f575c26
|
DI: StudioNotifyService
|
2019-11-01 11:49:08 +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 |
|
|
|
78584b78a3
|
DI: removed LogManager
|
2019-10-22 14:21:44 +03:00 |
|
|
|
53d2aaa4e3
|
DI: DbManager
|
2019-10-21 16:50:20 +03:00 |
|
|
|
e82366a2cd
|
DI: dbManager
|
2019-10-21 15:33:02 +03:00 |
|
|
|
09881619b8
|
DI: DbManager
|
2019-10-18 16:29:24 +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 |
|
|
|
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 |
|
|
|
2ebe431c98
|
DI: configuration
|
2019-10-10 11:52:21 +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 |
|
Daniil Senkiv
|
b348c918ad
|
Web.Client: Confirm: added profileRemove page with deletion profile only from admin account
|
2019-10-02 14:52:40 +03:00 |
|
Daniil Senkiv
|
2b087d6e20
|
Web.Client: Confirm: activateEmail: added real api method, fixed generation link
|
2019-09-30 14:30:26 +03:00 |
|
Daniil Senkiv
|
6ebf6afc32
|
Web.Core: StudioNotifyService: fixed generating confirm activation link
|
2019-09-27 17:49:45 +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 |
|
Daniil Senkiv
|
c0dc7125ea
|
Web.Core: CommonLinkUtility: fixed generating confirm link
|
2019-09-27 11:58:10 +03:00 |
|
|
|
84ba343460
|
Auth: added check confirm method
|
2019-09-26 16:36:53 +03:00 |
|
Daniil Senkiv
|
95a369a091
|
Web.Core: revert d511e14e8e
|
2019-09-26 14:59:18 +03:00 |
|
|
|
94ab6c96aa
|
Notify: check guest
|
2019-09-26 14:54:53 +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 |
|
|
|
f247b4a303
|
Notify: fixed resources
|
2019-09-24 19:21:05 +03:00 |
|
|
|
afb1f90e9a
|
.net core up to 3.0.0
|
2019-09-24 14:20:58 +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 |
|
|
|
859bda608b
|
Settings: added get cultures method
|
2019-09-23 16:19:01 +03:00 |
|
|
|
6de13b9d50
|
DI: configuration
|
2019-09-23 15:20:08 +03:00 |
|
|
|
1e946b19b6
|
DI: refactoring
|
2019-09-20 18:53:27 +03:00 |
|
|
|
8184492a4f
|
DI: ConfigurationManager
|
2019-09-20 18:08:45 +03:00 |
|
|
|
181e570ce1
|
DI: CommonServiceProvider
|
2019-09-20 16:06:10 +03:00 |
|
|
|
41b4a909cd
|
DI: TenantManager
|
2019-09-20 15:47:00 +03:00 |
|
|
|
7bb42748b7
|
DI TenantManager
|
2019-09-20 15:20:03 +03:00 |
|
|
|
df9b6efa92
|
Merge branch 'master' into refactoring/di
# Conflicts:
# products/ASC.People/Server/Controllers/GroupController.cs
|
2019-09-20 14:27:03 +03:00 |
|
Daniil Senkiv
|
d511e14e8e
|
Web.Core: CommonLinkUtility: fixed generating link for creating user through invitation link
|
2019-09-20 10:58:07 +03:00 |
|
|
|
e13049c21f
|
DI: CommonLinkUtility
|
2019-09-19 18:55:44 +03:00 |
|
|
|
409da28d4b
|
DI: SubscriptionManager
|
2019-09-19 16:43:28 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
98daea7115
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
|
2019-09-13 17:47:23 +03:00 |
|
|
|
bdb5b05748
|
ASC.People: ProfileAction: sending email change instructions
|
2019-09-13 17:45:22 +03:00 |
|
|
|
f4d4de3cec
|
People: fixed remove photo
|
2019-09-13 16:19:47 +03:00 |
|
|
|
bf86c4e4ef
|
People: fixed remove photo
|
2019-09-13 16:15:51 +03:00 |
|
NikolayRechkin
|
25ae6b8b05
|
web: People: creating a user avatar
|
2019-09-13 14:41:15 +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 |
|
|
|
c50b5b0fc9
|
csproj: remove pdb file from release build configuration
|
2019-09-10 16:38:20 +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 |
|
|
|
e2a4311a29
|
Dependency injection
Packages updated
|
2019-09-09 15:56:33 +03:00 |
|
Daniil Senkiv
|
8629a15679
|
Web.Core: CommonLinkUtility: fixed
|
2019-09-09 15:07:15 +03:00 |
|
|
|
c7282888d0
|
Added PortalController
|
2019-09-03 18:13:25 +03:00 |
|
|
|
238e103440
|
Optimization
|
2019-09-03 15:23:58 +03:00 |
|
|
|
26e3ba145e
|
Optimization
|
2019-09-02 18:10:27 +03:00 |
|
|
|
12747318c6
|
Optimization
|
2019-08-30 15:40:57 +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 |
|
|
|
e8b625f7b4
|
removed unused resources
|
2019-08-23 14:26:18 +03:00 |
|
|
|
39bac7cc64
|
Notify: name removed
|
2019-08-22 18:59:49 +03:00 |
|
|
|
303bc66028
|
NamingPeopleResource: public
|
2019-08-22 18:58:09 +03:00 |
|
|
|
23d8201b82
|
NamingPeopleResource: public
|
2019-08-22 16:09:57 +03:00 |
|
|
|
8c8b844a70
|
Added ASC.Notify.Textile
|
2019-08-19 16:51:36 +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 |
|
|
|
65563552fa
|
Packages updated
|
2019-08-15 14:33:57 +03:00 |
|
|
|
ddfbab4c24
|
Resources: notify
|
2019-08-15 11:44:27 +03:00 |
|
|
|
54f2959906
|
Resources: translation
|
2019-08-14 14:27:38 +03:00 |
|
|
|
acebed2520
|
Resources: translations
|
2019-08-13 19:01:36 +03:00 |
|
|
|
a956764e9c
|
Resources: translate
|
2019-08-13 18:49:59 +03:00 |
|
|
|
e32c19bde3
|
Translate: Resource
|
2019-08-13 18:06:13 +03:00 |
|
|
|
edab2bda33
|
Translate: Resource
|
2019-08-13 17:46:30 +03:00 |
|
|
|
18f3405715
|
Translate: NamingPeopleResource
|
2019-08-13 16:46:10 +03:00 |
|
|
|
d7376418f8
|
Removed unused resources
|
2019-08-13 16:05:36 +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 |
|
|
|
f85711b736
|
Optimization
|
2019-08-08 12:26:58 +03:00 |
|
|
|
175b1aee83
|
UserPhotoManager: fix
|
2019-08-05 16:29:58 +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 |
|
|
|
3036e1cb90
|
Added ASC.Studio.Notify service
|
2019-08-01 11:47:15 +03:00 |
|
|
|
663093b7e5
|
People: cache default photo
|
2019-07-24 15:34:23 +03:00 |
|
|
|
e0bd70afad
|
Core: fix build
|
2019-07-24 14:40:14 +03:00 |
|
|
|
bb1f3f8524
|
Replace AscCache.Default with Memory and Notify
|
2019-07-23 16:05:40 +03:00 |
|
|
|
7f8db3a4f8
|
Replace AscCache.Default with Memory and Notify
|
2019-07-23 12:06:05 +03:00 |
|
|
|
cb5f732e76
|
Replaced ICacheNotify with ICacheNotify<>
Removed RedisCache
|
2019-07-22 15:31:09 +03:00 |
|
|
|
f0c9d0974f
|
FederatedLogin: di
|
2019-07-12 16:23:39 +03:00 |
|
|
|
1ad03ec6d8
|
Added auth to StorageHandler
|
2019-07-09 13:29:53 +03:00 |
|
|
|
fabbcfffff
|
Api: SetCookies. Searching dll and resources in valid path
|
2019-07-08 15:15:24 +03:00 |
|
|
|
73ba76d57b
|
People as external product
nginx reverse proxy
|
2019-07-05 16:58:04 +03:00 |
|
|
|
ca6fdb500d
|
Remove HttpContext.Current
|
2019-07-02 18:30:31 +03:00 |
|
|
|
e303a103a6
|
ASC.MessageService: refactoring. DI
|
2019-06-17 16:53:10 +03:00 |
|
|
|
0ffdc833b8
|
Api: added some methods
|
2019-06-17 14:57:07 +03:00 |
|
|
|
377287570a
|
Added ASC.Feed, ASC.IPSecurity
Added Resources
|
2019-06-14 19:14:24 +03:00 |
|
|
|
323df065ea
|
People: added EmployeeWraperFull
|
2019-06-11 18:20:04 +03:00 |
|
|
|
b797986c8c
|
Api controllers via autofac
|
2019-06-10 19:15:34 +03:00 |
|
|
|
8ad94d7d0d
|
Api: get modules via WebItemManager
|
2019-06-10 15:17:45 +03:00 |
|
|
|
3fc2786366
|
Api.People: default avatars
|
2019-06-07 18:32:20 +03:00 |
|
|
|
48fc6b0de1
|
Using ASC.Common.Utils.ConfigurationManager
|
2019-06-07 18:31:32 +03:00 |
|
|
|
531763fa1c
|
Added ASC.Web.Core
|
2019-06-07 11:59:07 +03:00 |
|
