75ebc4ce65
fix await using
2023-06-01 14:27:27 +03:00
f34cab4bf3
remove wait
2023-05-24 10:15:16 +03:00
5cbdfdef9b
Merge branch 'develop' into feature/optimization-ef
2023-05-17 11:01:32 +03:00
94ef7b3610
CustomSynchronizationContext.CurrentCulture to CultureInfo.CurrentCulture
2023-04-27 13:15:42 +03:00
diana-vahomskaya
23c7b0d2ac
fix comments
2023-04-17 16:38:00 +03:00
4dad1d6067
Merge branch 'develop' into feature/optimization-ef
2023-04-10 23:19:56 +03:00
07d847fdd1
Merge branch 'develop' into feature/optimization-ef
2023-04-06 17:24:05 +03: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
6309d9530c
fix async
2023-03-30 15:11:45 +03:00
0bcd45f0ce
fix async
2023-03-28 10:43:46 +03:00
d39c28046c
add CustomSynchronizationContext
2023-03-27 15:04:50 +03:00
44317ee151
WebstudioDbContext -async
2023-03-24 19:24:59 +03:00
63ee0ca117
UserDbContext - async
2023-03-24 10:53:49 +03:00
a3800de721
TenantDbContext -async part1
2023-03-20 19:16:00 +03:00
a2c35b0a40
backend: ldap/s3: removed check mono
2023-03-17 18:02:19 +03:00
405ed839bb
CoreDbContext -async
2023-03-14 23:44:44 +03:00
03a4dc89dc
Settings: refactoring
2023-02-24 17:19:10 +03:00
8ad635ba25
merge from release/rc-v1.2.0. fixed problem and update dll
2023-01-19 15:47:09 +03:00
143a4d01ec
removed unused variables
2022-12-09 17:47:46 +03:00
b693486b46
merge from develop
2022-12-01 14:52:46 +03:00
61b401d906
fix
2022-11-15 13:28:25 +03:00
a4fd81b404
migrate from .net6 to .net7
2022-11-10 13:10:18 +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
2ae75ec762
fix ide001
2022-11-07 12:49:29 +03:00
ca85ef1d49
fix usings
2022-11-07 12:34:50 +03:00
141bed97b4
Merge branch 'develop' into feature/refactoring-saveUserInfo
2022-11-02 11:16:29 +03:00
0f3490b977
DoJob return task
2022-10-27 14:14:41 +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
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
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
4ebd5323c0
Quota: fix
2022-10-06 15:55:47 +03:00
00bd41ad0a
Merge branch 'develop' into feature/user-quota
2022-09-23 17:15:49 +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
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
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
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
f16da6e3ad
refactor
2022-09-09 17:31:56 +03:00
2146cd7020
Quota: fix ldap quota
2022-08-30 11:00:37 +03:00
933a4129fa
Quota: string representation of quota
2022-08-29 20:20:58 +03:00
d70bf58c0a
Quota: ldap user quota limit
2022-08-29 14:07:52 +03:00
