Commit Graph

155 Commits

Author SHA1 Message Date
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
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