DocSpace-client/common/ASC.Core.Common
pavelbannov 2c53224c3f Merge branch 'develop' into feature/backup-s3-tar
# Conflicts:
#	common/ASC.Data.Storage/S3/S3Storage.cs
2023-09-07 17:10:28 +03:00
..
Billing Merge branch 'hotfix/v1.1.2' into develop 2023-08-28 18:53:10 +03:00
Caching People: filter by employeeTypes 2023-07-12 13:10:47 +03:00
Configuration Merge branch 'develop' into feature/backup-s3-tar 2023-08-29 14:31:16 +03:00
Context Merge branch 'hotfix/v1.1.2' into develop 2023-08-28 18:53:10 +03:00
Core Merge branch 'hotfix/v1.1.2' into develop 2023-08-28 18:53:10 +03:00
Data Merge branch 'hotfix/v1.1.2' into develop 2023-08-28 18:53:10 +03:00
EF Merge branch 'hotfix/v1.1.2' into develop 2023-09-01 15:33:39 +03:00
Encryption Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 2023-08-01 17:07:05 +03:00
Hosting Merge branch 'develop' into feature/optimization-queries 2023-06-27 18:29:23 +03:00
Log Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
Messaging refactoring 2023-08-11 11:03:43 +03:00
Notify Merge branch 'develop' into feature/tag-new-optimization 2023-09-04 14:32:04 +03:00
Properties code cleanup 2022-04-14 22:42:15 +03:00
protos Payments: fix cache 2022-10-05 12:12:16 +03:00
Quota Merge branch 'hotfix/v1.1.2' into develop 2023-09-01 15:33:39 +03:00
Radicale Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 2023-08-01 17:07:05 +03:00
Security Merge branch 'hotfix/v1.1.3' into develop 2023-09-05 09:45:42 +04:00
Settings Settings: refactoring 2023-02-24 17:19:10 +03:00
Tenants Merge branch 'hotfix/v1.1.2' into develop 2023-08-28 18:53:10 +03:00
Tests Tests moved to separate projects. 2021-06-01 12:21:51 +03:00
Users Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 2023-08-01 17:07:05 +03:00
WhiteLabel Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 2023-08-01 17:07:05 +03:00
ASC.Core.Common.csproj Merge branch 'hotfix/v1.1.2' into develop 2023-08-28 18:53:10 +03:00
BaseCommonLinkUtility.cs Revert "Revert "backend: removed X-REWRITER-URL header"" 2023-05-10 13:07:24 +03:00
ByteConverter.cs UserQuota: fix 2022-09-10 18:07:50 +03:00
GeolocationHelper.cs audit geolocation 2023-08-10 17:28:35 +03:00
GlobalUsings.cs fix 2023-08-23 19:37:27 +03:00
HostedSolution.cs Merge branch 'hotfix/v1.1.2' into develop 2023-08-28 18:53:10 +03:00
MultiRegionHostedSolution.cs Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00