|
33de49463a
|
People: fix permissions checking
|
2022-12-08 14:56:05 +03:00 |
|
|
837cee5b8f
|
People: changed permissions validation logic
|
2022-12-06 01:57:55 +03:00 |
|
|
094e8d41ff
|
Merge branch 'develop' into feature/room-admin-permissions
|
2022-12-05 11:15:15 +03:00 |
|
|
bacde66b72
|
Merge branch 'develop' into feature/users-payments-filter
|
2022-11-29 22:24:50 +03:00 |
|
|
c32e90f9ef
|
People: changed validation
|
2022-11-29 11:59:33 +03:00 |
|
|
2f7fdaf00a
|
Merge pull request #971 from ONLYOFFICE/feature/refactoring-saveUserInfo
Feature/remove .wait and .result
|
2022-11-16 18:24:29 +03:00 |
|
|
782b928ef0
|
People: allowNotPayment
|
2022-11-16 18:14:47 +03:00 |
|
|
13eb4fec1b
|
People: added filtering users by paid
|
2022-11-10 17:14:03 +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 |
|
|
34bda20eb0
|
Merge branch 'develop' into feature/recalculate-user-quota
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
|
2022-11-02 13:40:53 +03:00 |
|
|
141bed97b4
|
Merge branch 'develop' into feature/refactoring-saveUserInfo
|
2022-11-02 11:16:29 +03:00 |
|
|
78bd9f0e13
|
Merge branch 'develop' into feature/invite-accounts
|
2022-10-27 19:18:07 +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 |
|
|
06f8917b77
|
People: added link logging
|
2022-10-26 18:20:37 +03:00 |
|
|
f137df85cc
|
People: added resend docspace invite
|
2022-10-26 18:16:46 +03:00 |
|
|
3e1b1bbe6a
|
People: fix links security, refactor
|
2022-10-26 17:40:43 +03:00 |
|
|
3adb7d5e8e
|
People: added api for inviting users
|
2022-10-25 23:18:07 +03:00 |
|
|
92ef73eb86
|
async UpdateUserInfo and SaveUserInfo
|
2022-10-25 18:27:56 +03:00 |
|
|
128527a809
|
Merge branch 'develop' into feature/recalculate-user-quota
|
2022-10-25 17:33:56 +03:00 |
|
|
4ad83e7258
|
Quota: quota recalculation check function
|
2022-10-25 17:31:25 +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 |
|
|
ac0e87e581
|
Quota: fix
|
2022-10-19 14:48:48 +03:00 |
|
|
9df8c0d69f
|
Quota: fix
|
2022-10-18 21:37:16 +03:00 |
|
|
1a5c273825
|
refactor
|
2022-10-18 14:43:31 +03:00 |
|
|
a2d144514d
|
refactor
|
2022-10-18 14:22:02 +03:00 |
|
|
7280d2d52b
|
Merge branch 'develop' into feature/recalculate-user-quota
|
2022-10-17 14:20:31 +03:00 |
|
|
44149d47b7
|
Users: trash, favorites, recent folders
|
2022-10-12 18:53:48 +03:00 |
|
|
b1bd5a100f
|
Quota: recalculate user quota
|
2022-10-12 14:23:57 +03:00 |
|
|
4dbf1e70b7
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.ActiveDirectory/GlobalUsings.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
|
2022-10-10 19:16:03 +03:00 |
|
|
5b96dbdb55
|
removed DbUsersQuotaRow
|
2022-10-07 16:37:57 +03:00 |
|
|
00bd41ad0a
|
Merge branch 'develop' into feature/user-quota
|
2022-09-23 17:15:49 +03:00 |
|
|
28802b6926
|
Quota: fix
|
2022-09-23 17:14:55 +03:00 |
|
|
fffdc56a80
|
fix
|
2022-09-23 16:22:02 +03:00 |
|
|
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 |
|
|
9c8bf9708a
|
Payment: UsersInRoomStatistic
|
2022-09-20 23:22:27 +03:00 |
|
|
5740b578db
|
Payment: rename
|
2022-09-19 18:20:21 +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 |
|
|
d05071110d
|
Merge branch 'develop' into feature/room-security
|
2022-09-19 11:54:55 +03:00 |
|
|
6b728a0fca
|
refactoring
|
2022-09-15 18:58:05 +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 |
|
|
cfb0c957e9
|
Quota: user quota storage core_user -> webstudio_settings
|
2022-09-15 15:38:31 +03:00 |
|
|
40702707bd
|
refactoring
|
2022-09-14 14:21:25 +03:00 |
|
|
1726057d95
|
People: fix, refactor
|
2022-09-14 12:59:55 +03:00 |
|
|
d573733800
|
People: added invite by link
|
2022-09-13 23:47:35 +03:00 |
|
|
14dfc1f5a7
|
Merge branch 'feature/user-quota' of https://github.com/ONLYOFFICE/DocSpace into feature/user-quota
|
2022-09-13 00:41:59 +03:00 |
|
|
068e3c051b
|
Quota: Quota limit string -> long
|
2022-09-13 00:40:10 +03:00 |
|
|
23731e8eab
|
UserQuota: fix
|
2022-09-10 18:07:50 +03:00 |
|