Commit Graph

270 Commits

Author SHA1 Message Date
1da3a38513 Revert "Revert "backend: removed X-REWRITER-URL header""
This reverts commit 39c1824162.
2023-05-10 13:07:24 +03:00
976c288d32 Merge branch 'hotfix/v1.0.1' into bugfix/61992 2023-05-08 17:30:29 +03:00
bede99f758 fixed price for current quota 2023-05-07 22:35:39 +03:00
NikitaVashchuk
ea31657287 fix bug 61992 2023-05-05 21:44:35 +05:00
39c1824162 Revert "backend: removed X-REWRITER-URL header"
This reverts commit 93ec325611.
2023-04-27 22:35:00 +03:00
93ec325611 backend: removed X-REWRITER-URL header 2023-04-24 16:23:42 +03:00
1711004cfb backend: using RemoteIpAddress method for get a client ip 2023-04-20 18:24:31 +03:00
2633233cf2 UserManager: fix cache 2023-04-14 18:42:23 +03:00
496085fa48 fix Bug 62023 2023-04-14 15:49:41 +03:00
ed96fe2bdb refresh quota 2023-04-11 18:58:44 +03:00
NikitaVashchuk
1827dead7e fix problems with notify about count paid users 2023-04-04 17:23:46 +05:00
Vashchuk Nikita
0db7c335bf socket notification when archiving a room,
changed file_size id to total_size when added/deleted files,
fix notification when adding paid users,
fix notification when block/unblock users,
fix problem with change-quota-feature-value notification when updating quota
2023-04-03 16:31:14 +05:00
Vashchuk Nikita
604b67fa58 functionality for notification ASC.Socket.IO about quota changes 2023-03-30 19:13:13 +05:00
0abe404476 invitation link: added tariff/quota/permissions check, refactoring 2023-03-23 16:22:01 +03:00
e2f90e5367 fix set quota row 2023-02-28 16:51:37 +03:00
5a65b42177 Core: fixed invite 2023-02-21 19:00:25 +03:00
e171ee44e5 Core: refactor 2023-02-20 11:15:18 +03:00
068004ed28 Core: fix 2023-02-17 18:11:02 +03:00
19899d14e9 Core: added collaborator, refactor 2023-02-17 17:53:18 +03:00
90fdd58d1c Core: added collaborator group and type 2023-02-17 11:27:27 +03:00
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