Artem Tarasov
|
07089f2fc7
|
added api methods
|
2020-07-08 11:29:44 +03:00 |
|
|
da9423bfdc
|
Wizard: api
|
2020-07-02 17:11:59 +03:00 |
|
|
635ff124fb
|
Json: fixed enum
|
2020-06-05 14:05:42 +03:00 |
|
|
b569245076
|
rever logger
|
2020-06-04 16:47:27 +03:00 |
|
|
b55cc7c697
|
Startup: added command line
|
2020-06-04 16:26:31 +03:00 |
|
|
794486f335
|
Notify: temp log
|
2020-06-04 16:04:17 +03:00 |
|
|
a14049e88f
|
Settings: fixed GetSupportedCultures
|
2020-06-03 18:51:01 +03:00 |
|
|
a1778b5cdf
|
Packages updated
|
2020-06-01 14:36:23 +03:00 |
|
|
e7ecaefa3c
|
Added JsonStringEnumConverter
|
2020-05-27 16:19:58 +03:00 |
|
|
ecd66902a0
|
Merge branch 'master' into feature/system-json
|
2020-05-18 14:16:03 +03:00 |
|
|
550b0dd20e
|
Sln: packages updated
|
2020-05-18 10:27:22 +03:00 |
|
|
3a747ef8e4
|
Merge branch 'master' into feature/system-json
# Conflicts:
# common/ASC.Api.Core/Core/ApiContext.cs
# common/ASC.Api.Core/Core/ApiDateTime.cs
# common/ASC.Api.Core/Model/EmployeeWraper.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.People/Server/Models/GroupWrapperFull.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Models/BuildVersion.cs
|
2020-05-07 10:28:20 +03:00 |
|
|
44ec45ebb6
|
Merge branch 'master' into feature/elastic
# Conflicts:
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Caching/CachedQuotaService.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/AuthManager.cs
# common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Core.Common/Data/DbSettingsManager.cs
# common/ASC.Core.Common/Tenants/TenantUtil.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.Studio.Notify/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2020-02-25 11:24:45 +03:00 |
|
|
9db8b26985
|
Replaced NewtonsoftJson with System.Text.Json
|
2020-02-21 16:19:32 +03:00 |
|
|
bc6e1d5e9e
|
updated dependecies
|
2020-02-21 11:13:01 +03:00 |
|
|
c5dbf8c859
|
Removed unused dependencies
|
2020-02-20 17:57:48 +03:00 |
|
|
a5280a1694
|
Added DIHelper
|
2020-02-17 11:58:14 +03:00 |
|
|
8c2b39406f
|
Merge branch 'master' into feature/merge
|
2020-02-03 14:29:41 +03:00 |
|
|
f017d9cc23
|
fix from review
|
2020-02-03 13:48:06 +03:00 |
|
|
acde301b26
|
Merge branch 'master' into feature/merge
|
2020-01-31 10:59:00 +03:00 |
|
|
4ea450720b
|
moved from hotfix/10.5.2
|
2020-01-22 10:53:16 +03:00 |
|
|
2722dfd693
|
moved from hotfix/10.5.2
|
2020-01-21 15:44:05 +03:00 |
|
Daniil Senkiv
|
8568666e62
|
Settings: get customschema through schema id
|
2020-01-21 15:43:52 +03:00 |
|
|
f730ba5945
|
Settings: added customschemas
|
2020-01-20 18:29:30 +03:00 |
|
|
8f6252f6e3
|
Settings: added CustomNamingPeople
|
2020-01-16 18:01:07 +03:00 |
|
|
dd28738907
|
Settings: Added SendOwnerChangeInstructions and ChangeOwner
|
2020-01-15 18:22:43 +03:00 |
|
|
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 |
|