|
|
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 |
|
|
|
fcc4e4605f
|
Common nlog config
|
2019-11-15 11:47:56 +03:00 |
|
|
|
2a1120645a
|
Web: Client: added lazy loader to tabs, added ownerId to settings controller
|
2019-11-15 10:19:37 +03:00 |
|
|
|
04464d52ad
|
Add "AddEnvironmentVariables" setting
|
2019-11-14 12:21:15 +03:00 |
|
|
|
d49c5f6988
|
Auth: set cookie on server
|
2019-11-12 14:46:58 +03:00 |
|
|
|
d7df467a3c
|
Api: added logout method
|
2019-11-12 14:32:05 +03:00 |
|
Daniil Senkiv
|
203e0f9810
|
Web.Api: SettingsController: fixed handling displayName for getting time zones
|
2019-11-12 12:18:11 +03:00 |
|
|
|
b2dc574943
|
Settings: fixed di
|
2019-11-12 11:47:49 +03:00 |
|
|
|
26c8d56219
|
DI: refactoring. Added EmployeeWraperHelper
|
2019-11-11 18:42:07 +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 |
|
|
|
50f06898d7
|
Merge branch 'master' into refactoring/di
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2019-11-10 18:22:02 +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 |
|
|
|
19b1a0a825
|
Web: Client: fixed paging navigation on accessRights page, deleted OwnerId from settingController
|
2019-11-08 14:05:06 +03:00 |
|
Daniil Senkiv
|
dc09621f5d
|
Web.Api: added unconditional getting greetingSettings;
Web.Client: moved greetingSettings from setting reducer to auth reducer
|
2019-11-07 10:06:13 +03:00 |
|
|
|
db4ef4a17a
|
DI: Log. refactoring.
|
2019-11-06 18:03:09 +03:00 |
|
Daniil Senkiv
|
7d159d8659
|
Web.Client/Server: renamed companyName to greetingSettings
|
2019-11-06 14:32:04 +03:00 |
|
Daniil Senkiv
|
a877f9d0dd
|
Web.Client/Server: added getting companyName from initial api request, applied to Login component
|
2019-11-06 14:14:23 +03:00 |
|
Daniil Senkiv
|
a153d90082
|
Web.Client/Server: Settings: added changing greetingTitle
|
2019-11-05 16:15:47 +03:00 |
|
|
|
d7a4dd7fed
|
Merge branch 'master' into refactoring/di
|
2019-11-01 12:41:30 +03:00 |
|
|
|
0be2995e83
|
DI: filters and handlers
|
2019-11-01 12:37:02 +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 |
|
Daniil Senkiv
|
3c49eae16d
|
Web.Api: SettingsController: fixed (076ed6679b)
|
2019-10-30 15:26:42 +03:00 |
|
Daniil Senkiv
|
076ed6679b
|
Web.Api: SettingsController: fixed handling displayName for IANA timezones
|
2019-10-30 15:21:32 +03:00 |
|
Daniil Senkiv
|
a7ab8f48e0
|
Web.Api: SettingsController: added new model for timezones, changed api method
|
2019-10-30 14:33:27 +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 |
|
Daniil Senkiv
|
fafa3f5ec0
|
Revert "Web.Api: SettingsController: added new model for timezones"
This reverts commit 43c445d31b.
|
2019-10-30 11:02:46 +03:00 |
|
Daniil Senkiv
|
43c445d31b
|
Web.Api: SettingsController: added new model for timezones
|
2019-10-30 09:49:38 +03:00 |
|
|
|
010d6af66b
|
Web: Api: added OwnerId to SettingsController
|
2019-10-29 16:41:42 +03:00 |
|
Daniil Senkiv
|
821f804ccd
|
Web.Client/Api: Settings: Common: added changing portal language and timezone
|
2019-10-25 20:35:46 +03:00 |
|
|
|
726ca634e4
|
Revert "removed ConfigurationManager"
This reverts commit c03be150f4.
ProgressQueue init
|
2019-10-22 16:48:48 +03:00 |
|
|
|
78584b78a3
|
DI: removed LogManager
|
2019-10-22 14:21:44 +03:00 |
|
|
|
337238c87c
|
Removed CommonServiceProvider
|
2019-10-21 18:05:36 +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 |
|
|
|
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 |
|
|
|
74d8709f62
|
DI: configuration
|
2019-10-09 19:08:37 +03:00 |
|
|
|
665ed9eb3c
|
Settings: GetPasswordSettings available for everyone
ConfirmAuthHandler: handle ArgumentNullException
|
2019-09-27 17:03:24 +03:00 |
|
|
|
f6e2c3b1ac
|
Settings: fixed GetPasswordSettings
|
2019-09-27 16:26:53 +03:00 |
|
|
|
c8573b8301
|
Confirm: fixed invite link
|
2019-09-27 15:28:51 +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 |
|
|
|
84ba343460
|
Auth: added check confirm method
|
2019-09-26 16:36:53 +03:00 |
|
|
|
2034777701
|
added check permission for GeInviteLink
|
2019-09-26 11:36:49 +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 |
|
|
|
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 |
|
|
|
181e570ce1
|
DI: CommonServiceProvider
|
2019-09-20 16:06:10 +03:00 |
|
|
|
e13049c21f
|
DI: CommonLinkUtility
|
2019-09-19 18:55:44 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
c7282888d0
|
Added PortalController
|
2019-09-03 18:13:25 +03:00 |
|
|
|
238e103440
|
Optimization
|
2019-09-03 15:23:58 +03:00 |
|
|
|
a26d8d24ce
|
Api: added CustomJsonOptionsWrapper. optimization
|
2019-09-03 12:31:15 +03:00 |
|
|
|
173d9b1179
|
fix
|
2019-09-02 19:14:54 +03:00 |
|
|
|
26e3ba145e
|
Optimization
|
2019-09-02 18:10:27 +03:00 |
|
|
|
12747318c6
|
Optimization
|
2019-08-30 15:40:57 +03:00 |
|
|
|
d16d5f1251
|
Kafka: create only one producer for instance
UserPhotoManager: optimization
|
2019-08-27 17:57:06 +03:00 |
|
|
|
6cae722b9d
|
kafka disabled by default
|
2019-08-23 15:49:23 +03:00 |
|
|
|
f125f6cc13
|
Api: settings. AllowAnonymous
|
2019-08-16 15:11:38 +03:00 |
|
|
|
9e32ad4b6c
|
IDE0063
|
2019-08-15 18:08:40 +03:00 |
|
|
|
b426004f70
|
IDE0019, IDE0020
|
2019-08-15 16:41:38 +03:00 |
|
|
|
f6d78d3cba
|
Code Cleanup
|
2019-08-15 15:04:42 +03:00 |
|
|
|
65563552fa
|
Packages updated
|
2019-08-15 14:33:57 +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 |
|
|
|
f85711b736
|
Optimization
|
2019-08-08 12:26:58 +03:00 |
|
|
|
1fd62e757c
|
Api: RegisterForDispose DisposableHttpContext
|
2019-08-05 15:37:33 +03:00 |
|
|
|
1de8fd7398
|
Api: fields
|
2019-08-02 17:40:33 +03:00 |
|
|
|
969a605ad1
|
Upgrade references
|
2019-07-24 15:33:14 +03:00 |
|
|
|
324ac1be9c
|
Added XmlOutputFormatter
|
2019-07-24 13:48:45 +03:00 |
|
|
|
6e500b0986
|
Upgrade .net core to 3.0.0-preview6
Added KafkaCache
|
2019-07-19 16:10:15 +03:00 |
|
