Commit Graph

250 Commits

Author SHA1 Message Date
5311005587 fix Bug 60606 2023-01-20 15:34:36 +03:00
0d46e034e7 Files.Service: added users module for feed aggregator 2023-01-18 18:36:06 +03:00
6c112da511 Core: fixed user status change 2022-12-14 14:38:40 +03:00
cd0de88e6c Core.Common: fix getting user groups 2022-12-08 14:55:05 +03:00
a03b50bd7c Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 16:20:29 +03:00
61f7765a4f Merge branch 'develop' into feature/api-origin 2022-12-06 21:47:56 +03:00
346c8d08e3 Core.Common: changed permissions validation logic 2022-12-06 01:57:45 +03:00
094e8d41ff Merge branch 'develop' into feature/room-admin-permissions 2022-12-05 11:15:15 +03:00
baedfcc93a fixed performance issue 2022-11-29 16:47:26 +03:00
014c07c06a Core.Common: added option to disable validation 2022-11-29 11:51:54 +03:00
d1c0e79eee Get tenantDomain from origin 2022-11-18 17:17:50 +03:00
61b401d906 fix 2022-11-15 13:28:25 +03:00
789ab8f956 Merge branch 'develop' into feature/refactoring-saveUserInfo
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Core/FilesModule.cs
#	products/ASC.Files/Service/Core/FoldersModule.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-11-09 12:57:16 +03:00
141bed97b4 Merge branch 'develop' into feature/refactoring-saveUserInfo 2022-11-02 11:16:29 +03:00
d450457703 removed unnecessary call when inviting a user that reduces performance 2022-11-01 14:06:31 +03:00
ef7215fbe3 fix 2022-10-27 14:06:37 +03:00
deb0c5beb7 remove .wait and .result 2022-10-27 13:49:42 +03:00
92ef73eb86 async UpdateUserInfo and SaveUserInfo 2022-10-25 18:27:56 +03:00
42b4787899 refactoring saveUserInfo 2022-10-24 18:30:17 +03:00
22a24de659 Merge branch 'develop' into feature/rights-rework 2022-10-19 15:31:14 +03:00
4e0d77a239 fix wizard 2022-10-19 12:48:23 +03:00
9df8c0d69f Quota: fix 2022-10-18 21:37:16 +03:00
a2d144514d refactor 2022-10-18 14:22:02 +03:00
130e485a0c Payments: refactoring. TrialEnabled setting 2022-09-21 18:44:32 +03:00
4b0fc12efc Payment: rename 2022-09-19 18:03:25 +03:00
5848bf5cd3 Api: payments check 2022-09-19 17:56:45 +03:00
bec4f11dcd Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/components/Loaders/index.js
#	packages/common/store/AuthStore.js
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	packages/login/webpack.config.js
#	products/ASC.Files/Service/Program.cs
#	web/ASC.Web.Api/Program.cs
2022-09-15 17:16:04 +03:00
40702707bd refactoring 2022-09-14 14:21:25 +03:00
354c4a69ab Quota: refactoring 2022-09-08 19:57:36 +03:00
9154b971c0 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/api/settings/index.js
#	packages/common/components/Loaders/index.js
2022-08-29 13:06:44 +03:00
641695ec51 Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController 2022-08-25 23:09:12 +03:00
ff8e3c38e9 removed unnecessary 2022-08-25 13:54:11 +03:00
551ba285d6 CoreCommon: do not modify the source quota when multiplying 2022-08-25 09:15:59 +03:00
7a9e46bf54 Quota: refactoring 2022-08-24 19:05:15 +03:00
20dcd59616 Merge branch 'develop' into feature/push 2022-08-23 13:24:36 +03:00
737359b21a Merge branch 'develop' into feature/stripe 2022-08-23 12:05:06 +03:00
5b8374daa0 refactoring 2022-08-18 19:00:22 +03:00
b6559781ea CoreCommon: update subscription 2022-08-12 15:57:35 +03:00
ef7419c9ae CoreCommon: payment url with quantity of products 2022-08-12 15:57:35 +03:00
f563202326 Api: get stripe prices 2022-08-12 15:57:34 +03:00
3c926c4011 Api: backUrl for stripe link 2022-08-12 15:57:33 +03:00
6f98ad9c5f CoreCommon: get stripe portal link 2022-08-12 15:57:33 +03:00
a140de338b CoreCommon: email in payment 2022-08-12 15:57:33 +03:00
9fcefe157d Api: added method portal/payment/url 2022-08-12 15:57:32 +03:00
90c19508ea CoreCommon: tariff contains a list of quotas 2022-08-12 15:57:31 +03:00
4218e45601 CoreCommon: rename AvangateId field to ProductId 2022-08-12 15:57:28 +03:00
020fa7dcda Merge branch 'develop' into feature/push 2022-08-11 17:15:37 +03:00
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
14404198c2 Push: fixed a sender sink 2022-06-27 13:36:38 +03:00
e68ac70005 Merge branch 'develop' into feature/docspace 2022-06-20 12:15:08 +03:00