Artem Tarasov
|
1a8aacebdc
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Resource.Manager/Startup.cs
# web/ASC.Web.Components/src/components/password-input/index.js
|
2020-07-21 13:13:47 +03:00 |
|
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
|
7f095f03d1
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Resource.Manager/Startup.cs
# config/kafka.json
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
# web/ASC.Web.Core/TariffSettings.cs
|
2020-07-15 15:23:28 +03:00 |
|
|
|
4e5c187851
|
EF: DateTime? hack
|
2020-07-15 11:38:00 +03:00 |
|
|
|
a347f4e4f3
|
fix
|
2020-07-13 16:18:31 +03:00 |
|
SuhorukovAnton
|
2925ff25b4
|
api-defaultvalue: add System.Text.Json
|
2020-07-10 13:35:24 +03:00 |
|
|
|
5988855b61
|
Fix License
|
2020-07-08 18:30:23 +03:00 |
|
SuhorukovAnton
|
8b5ab8c9a4
|
api-defaultvalue: delete DataContracts
|
2020-07-08 13:10:09 +03:00 |
|
|
|
91d287a2d5
|
Merge branch 'master' into feature/system-json
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
|
2020-05-14 17:14:59 +03:00 |
|
|
|
7bf739fe09
|
Optimization
|
2020-05-07 14:02:29 +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 |
|
|
|
a90b1fb424
|
People: added GetExpression
|
2020-02-25 11:02:13 +03:00 |
|
|
|
c5dbf8c859
|
Removed unused dependencies
|
2020-02-20 17:57:48 +03:00 |
|
|
|
fbce5f3845
|
DI: HostedSolution
|
2020-02-20 11:05:10 +03:00 |
|
|
|
a5280a1694
|
Added DIHelper
|
2020-02-17 11:58:14 +03:00 |
|
|
|
7183be383f
|
Core: fixed removing group
|
2020-02-06 18:35:24 +03:00 |
|
|
|
201bd72624
|
EF: Added ignore case for search users by filter text
|
2020-02-05 16:59:04 +03:00 |
|
|
|
8c2b39406f
|
Merge branch 'master' into feature/merge
|
2020-02-03 14:29:41 +03:00 |
|
|
|
709343fc17
|
fixed removing from group
|
2020-02-03 14:27:13 +03:00 |
|
|
|
acde301b26
|
Merge branch 'master' into feature/merge
|
2020-01-31 10:59:00 +03:00 |
|
|
|
d2bf5ece2b
|
EF: fixed GetUserGroupRefs
|
2020-01-21 13:52:04 +03:00 |
|
|
|
011972be6f
|
fixed method set people admin
|
2020-01-21 12:03:25 +03:00 |
|
|
|
84062bc0c4
|
EF: fixed argumentNullException
|
2020-01-20 18:09:52 +03:00 |
|
|
|
4bad85defe
|
moved from hotfix/10.5.2
|
2020-01-17 16:58:26 +03:00 |
|
|
|
e4c1de4494
|
Core: Common: Fix "Sequence contains more than one matching element" on get TenantQuota
|
2019-12-26 10:13:09 +03:00 |
|
|
|
f0434a6546
|
People: fixed search by text
|
2019-12-25 18:28:19 +03:00 |
|
|
|
a8f8b63414
|
EF: removed old classes
|
2019-12-23 17:57:21 +03:00 |
|
|
|
04be312da4
|
EF: tenants. Use entity
|
2019-12-23 17:26:38 +03:00 |
|
NikolayRechkin
|
8122eaffdb
|
EF: added check for null
|
2019-12-19 17:06:18 +03:00 |
|
|
|
f696558445
|
EF: AddOrUpdate
|
2019-12-17 16:01:59 +03:00 |
|
|
|
b2002a08db
|
EF: MultiRegionHostedSolution
|
2019-12-17 11:27:38 +03:00 |
|
|
|
a47196dc05
|
EF: Voip
|
2019-12-11 17:30:28 +03:00 |
|
|
|
a4cfdb173c
|
EF: fix
|
2019-12-10 18:31:37 +03:00 |
|
|
|
8ad3b1ca1d
|
"DeleteOldEvents" temporary removed
|
2019-12-06 13:32:10 +03:00 |
|
|
|
74cb7e9582
|
EF: MessagingSystem
|
2019-12-05 11:51:28 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
02663dbf0c
|
Fixed object disposed exception
|
2019-11-12 13:40:02 +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 |
|
|
|
89b1a0956a
|
SettingsManager: cache
|
2019-11-06 11:55:59 +03:00 |
|
|
|
7a9c490467
|
Settings: fixed automapper settings
|
2019-11-05 15:34:00 +03:00 |
|
|
|
0801877060
|
DI: ASC.Studio.Notify.
Settings: AutoMapper
|
2019-11-01 16:56:47 +03:00 |
|
|
|
402c4d908d
|
DI: refactoring
|
2019-10-31 14:28:30 +03:00 |
|
|
|
8ca3a63e24
|
DI: refactoring
|
2019-10-22 19:08:37 +03:00 |
|
|
|
78584b78a3
|
DI: removed LogManager
|
2019-10-22 14:21:44 +03:00 |
|
|
|
e82366a2cd
|
DI: dbManager
|
2019-10-21 15:33:02 +03:00 |
|
|
|
09881619b8
|
DI: DbManager
|
2019-10-18 16:29:24 +03:00 |
|
|
|
7c05ba927b
|
DI: KafkaCache
|
2019-10-11 18:03:03 +03:00 |
|
|
|
75285dfc69
|
DI: configuration
|
2019-10-10 13:59:22 +03:00 |
|
|
|
2ebe431c98
|
DI: configuration
|
2019-10-10 11:52:21 +03:00 |
|
|
|
387ce4e9ad
|
DI: configuration
|
2019-09-27 14:51:09 +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 |
|
|
|
515ce6dae5
|
People: fixed filter method
|
2019-09-24 15:51:03 +03:00 |
|
|
|
dec4bb266e
|
DI: configuration
|
2019-09-24 13:32:12 +03:00 |
|
|
|
41b4a909cd
|
DI: TenantManager
|
2019-09-20 15:47:00 +03:00 |
|
|
|
deb8231f26
|
revert f85711b736
|
2019-09-12 14:34:58 +03:00 |
|
|
|
1530ec842e
|
DI: WebImageSupplier,WebItemSettings, SettingsManager
|
2019-09-11 13:42:52 +03:00 |
|
|
|
a26d8d24ce
|
Api: added CustomJsonOptionsWrapper. optimization
|
2019-09-03 12:31:15 +03:00 |
|
|
|
12747318c6
|
Optimization
|
2019-08-30 15:40:57 +03:00 |
|
|
|
0bd089938e
|
IDE0059
|
2019-08-16 12:08:46 +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 |
|
|
|
d9be7211f6
|
IDE0018
|
2019-08-15 16:05:50 +03:00 |
|
|
|
f8f2c94962
|
IDE0034
|
2019-08-15 16:00:20 +03:00 |
|
|
|
f6d78d3cba
|
Code Cleanup
|
2019-08-15 15:04:42 +03:00 |
|
|
|
96118df5bb
|
People: fix
|
2019-08-14 15:12:48 +03:00 |
|
|
|
f0d2854071
|
People: fix search by filter
|
2019-08-08 17:42:29 +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 |
|
|
|
00120d88c9
|
Notify: sender queue moved to ASC.Studio.Notify
|
2019-08-02 13:25:33 +03:00 |
|
|
|
cb5f732e76
|
Replaced ICacheNotify with ICacheNotify<>
Removed RedisCache
|
2019-07-22 15:31:09 +03:00 |
|
|
|
5c0943f2dd
|
Added custom ConfigurationManager instead of system
|
2019-05-17 18:27:52 +03:00 |
|
|
|
92ed33906c
|
init commit
|
2019-05-15 17:56:09 +03:00 |
|
