|
|
5271c7f2f5
|
Api: fix error response
|
2020-09-03 12:38:13 +03:00 |
|
maksim
|
8282f3f658
|
fix
|
2020-08-27 17:01:37 +03:00 |
|
|
|
4501d3229a
|
Nuget: replaced thirdparty
|
2020-08-20 17:50:08 +03:00 |
|
|
|
f00a964c32
|
Merge branch 'master' into feature/private
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2020-08-14 17:19:36 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
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 |
|
|
|
e10ac2ccfa
|
BaseStartup: refactoring
|
2020-07-15 15:33:44 +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 |
|
|
|
baa71247d8
|
Merge branch 'master' into feature/general-startup
|
2020-07-15 13:06:32 +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 |
|
SuhorukovAnton
|
9d069de30a
|
general-startup: transform GeneralStartup to BaseStartup
|
2020-07-07 23:00:39 +03:00 |
|
SuhorukovAnton
|
00558dd95f
|
general-startup: fix
|
2020-07-06 10:56:17 +03:00 |
|
SuhorukovAnton
|
71d90ebfa2
|
general-startup: fix
|
2020-07-03 18:57:59 +03:00 |
|
SuhorukovAnton
|
2f5491f1ba
|
general-startup: first version
|
2020-07-03 14:47:27 +03:00 |
|
|
|
c9a64ca377
|
Added NullIfDefault
|
2020-07-02 18:15:52 +03:00 |
|
|
|
da9423bfdc
|
Wizard: api
|
2020-07-02 17:11:59 +03:00 |
|
|
|
d14313c6c1
|
References updated
|
2020-06-25 14:38:34 +03:00 |
|
|
|
bb6f32e36a
|
Api: fix
|
2020-05-18 15:08:03 +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 |
|
|
|
47c79d57f0
|
Optimization
|
2020-05-17 16:08:20 +03:00 |
|
|
|
c47bcebff3
|
Core: removed Custom Resolver
|
2020-05-14 18:51: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 |
|
|
|
7fd2cd206b
|
Api: Update
|
2020-04-20 15:54:13 +03:00 |
|
|
|
212fb746c9
|
Files: thirdparty fix
|
2020-03-16 11:25:39 +03:00 |
|
|
|
35e2e20049
|
Files: added model
|
2020-02-25 15:21:48 +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 |
|
|
|
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 |
|
|
|
a5280a1694
|
Added DIHelper
|
2020-02-17 11:58:14 +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 |
|
|
|
26c8d56219
|
DI: refactoring. Added EmployeeWraperHelper
|
2019-11-11 18:42:07 +03:00 |
|
|
|
3e35efc027
|
ApiDateTime: removed TenantManager from param
|
2019-11-11 12:15:18 +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 |
|
|
|
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 |
|
|
|
0be2995e83
|
DI: filters and handlers
|
2019-11-01 12:37:02 +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 |
|
|
|
8ca3a63e24
|
DI: refactoring
|
2019-10-22 19:08:37 +03:00 |
|
|
|
6b2f6b0a7b
|
DI: log
|
2019-10-17 18:55:35 +03:00 |
|
|
|
55138419b4
|
Confirm: fix auth
|
2019-09-27 18:53:40 +03:00 |
|
|
|
665ed9eb3c
|
Settings: GetPasswordSettings available for everyone
ConfirmAuthHandler: handle ArgumentNullException
|
2019-09-27 17:03:24 +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 |
|
