IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7f1d946269
DocSpace-buildtools/common/ASC.Core.Common
History
pavelbannov 7f1d946269 Merge branch 'develop' into feature/stripe 
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
#	packages/client/src/pages/PortalSettings/index.js
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
2022-09-23 16:11:23 +03:00
..
Billing Payments: refactoring. TrialEnabled setting 2022-09-21 18:44:32 +03:00
Caching Core: fixed user cache 2022-08-31 21:06:26 +03:00
Configuration code cleanup 2022-04-14 22:42:15 +03:00
Context Payments: refactoring. TrialEnabled setting 2022-09-21 18:44:32 +03:00
Core Core: fixed user cache 2022-08-31 21:06:26 +03:00
Data Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController 2022-08-25 23:09:12 +03:00
EF DbTariffRow: removed id 2022-09-23 15:26:26 +03:00
Encryption fix usings 2022-05-24 18:41:28 +03:00
Hosting hosting: fixed running ActivePassive instance 2022-09-15 23:56:55 +03:00
Log Merge branch 'develop' into feature/migrations-fix 2022-07-11 13:28:49 +03:00
Messaging Merge branch 'develop' into feature/stripe 2022-09-23 16:11:23 +03:00
Notify Push: fix api 2022-08-24 14:26:45 +03:00
Properties code cleanup 2022-04-14 22:42:15 +03:00
protos Core: fixed user cache 2022-08-31 21:06:26 +03:00
Quota Payment: UsersInRoomStatistic 2022-09-20 23:22:27 +03:00
Radicale Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
Security Merge branch 'develop' into feature/room-security 2022-09-21 12:22:45 +03:00
Settings Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
Tenants Payments: refactoring. TrialEnabled setting 2022-09-21 18:44:32 +03:00
Tests
Users Payment: rename 2022-09-19 18:03:25 +03:00
WhiteLabel Settings: ignore id 2022-07-12 15:33:46 +03:00
ASC.Core.Common.csproj Push: post merge fixes 2022-08-15 01:00:11 +03:00
BaseCommonLinkUtility.cs moved from ddf515b8 2022-06-01 17:07:08 +03:00
ByteConverter.cs added new license headers 2022-03-15 21:00:53 +03:00
GeolocationHelper.cs Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController 2022-08-25 23:09:12 +03:00
GlobalUsings.cs Quota: refactoring 2022-09-06 12:14:08 +03:00
HostedSolution.cs Payments: refactoring. TrialEnabled setting 2022-09-21 18:44:32 +03:00
MultiRegionHostedSolution.cs Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController 2022-08-25 23:09:12 +03:00