Commit Graph

117 Commits

Author SHA1 Message Date
a3800de721 TenantDbContext -async part1 2023-03-20 19:16:00 +03:00
beb1834a0a EF: batch operations 2023-02-27 16:39:52 +03:00
4ddf7d521c update external dependency 2023-01-19 19:05:07 +03:00
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
ca85ef1d49 fix usings 2022-11-07 12:34:50 +03:00
14a64f4ad0 Merge branch 'develop' into feature/remove-waste
# Conflicts:
#	common/services/ASC.ApiSystem/GlobalUsings.cs
#	common/services/ASC.ApiSystem/Program.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	products/ASC.CRM/Server/Classes/Global.cs
#	products/ASC.Files/Server/ProductEntryPoint.cs
#	web/ASC.Web.Core/QuotaSync.cs
2022-11-07 11:25:54 +03:00
a2d144514d refactor 2022-10-18 14:22:02 +03:00
ed22136269 Merge branch 'develop' into feature/remove-waste 2022-10-17 14:31:57 +03:00
Vashchuk Nikita
4b1c7644af added functionality for flexible tfa configuration 2022-10-04 13:40:21 +04:00
1f07a7ddad Merge branch 'develop' into feature/remove-waste 2022-09-13 17:14:49 +03:00
3fab5e883b remove waste asc.ipSecurity 2022-09-08 13:50:43 +03:00
Vashchuk Nikita
cdb3b2ce65 - added functionality for adding ip restrictions for users and admins separately
- added functionality for reading CIDR notations
- modified EFmodel
2022-09-05 15:48:41 +04:00
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
c1be6ecb61 Settings: ignore id 2022-07-12 15:33:46 +03:00
c9f7e95d5c fixed iprestrictions method 2022-07-12 12:06:38 +03:00
8ea04bcc81 Merge branch 'develop' into feature/12.0
# Conflicts:
#	common/ASC.MessagingSystem/Data/MessagesRepository.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
2022-06-17 19:19:00 +03:00
3ebd67f444 merge from develop 2022-06-01 14:44:30 +03:00
e7886aff2c Log: refactoring 2022-05-26 12:01:54 +03:00
e6d7979e92 dbcontext: EnableRetryOnFailure for MySQL provider 2022-05-25 16:55:38 +03:00
75da995099 Merge branch 'develop' into feature/logger-refactoring 2022-05-20 17:01:51 +03:00
41e8bd87ce add loggers 2022-05-13 13:36:04 +03:00
89059cf32e Structured Logging 2022-04-28 12:15:33 +03:00
19cf415898 backend: updated packages version 2022-04-27 13:02:17 +03:00
13bbce8ea4 Custom logger replaced with Microsoft.Extensions.Logging 2022-04-26 20:53:48 +03:00
97b45d3bd5 ILog: refactoring 2022-04-25 21:02:18 +03:00
1dff9e18c4 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Api.Core/Core/CustomHealthCheck.cs
#	common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.IPSecurity/IPRestrictionsRepository.cs
#	common/ASC.IPSecurity/IPRestrictionsService.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileSharing.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-04-21 17:51:31 +03:00
9f1e7cc3b0 IPRestrictionsRepository: fix cache 2022-04-15 16:58:41 +03:00
95959317a2 fix 2022-04-11 10:38:00 +03:00
1b8be6f95c fix 2022-04-07 14:41:37 +03:00
f9da8e4026 iprestrictions
fix Verify
add check enable
add api method
2022-04-07 13:19:30 +03:00
a502c4ee52 IPRestrictionsRepository: fixed saving data 2022-04-07 08:41:58 +03:00
66ccce8eb5 Settings: refactoring 2022-03-24 12:35:00 +03:00
172eaa8985
Merge pull request #589 from ONLYOFFICE/feature/update-packages
Feature/update packages
2022-03-21 22:24:11 +04:00
dc238d96f3 IPSecurity: updated packages 2022-03-16 14:56:32 +03:00
65db98f65c added new license headers 2022-03-15 21:00:53 +03:00
3d50d7977b removed past license headers 2022-03-15 19:59:24 +03:00
99378a027e Csproj: ImplicitUsings 2022-03-05 11:20:05 +03:00
7ad1462b81 Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor 2022-02-21 12:51:45 +03:00
b9234fedb1 IpSecurity: fix 2022-02-15 18:57:45 +03:00
ca7140186d Core: resolve properties for mapping, add mapping/projection 2022-02-15 13:30:05 +03:00
8288f3c4ca Common: return IEventBust to ICacheNotify 2022-02-14 12:05:05 +03:00
06c73edf0b IPSecruity: removed unused field 2022-02-11 18:39:02 +03:00
5e92c8a1dd IPSecurity: reorganization 2022-02-11 18:37:45 +03:00
a761cf92db IPSecurity: used file-scoped namespaces 2022-02-11 18:26:31 +03:00
64f68c6ba3 IPSecurity: add projection 2022-02-11 18:23:31 +03:00
6bd3f69a5f IPSecurity: add usings 2022-02-11 18:23:06 +03:00
01c18cb878 IPSecurity: resolve properties for projection 2022-02-11 18:22:46 +03:00
5c3f8aefd9 IPSecurity: add braces 2022-02-11 18:22:17 +03:00
077d5dbb81 IPSecurity: private properties replaced by private fileds, cosmetic changes 2022-02-11 18:11:00 +03:00