|
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 |
|
|
92942fbcf6
|
People: fix
|
2022-08-15 14:30:50 +03:00 |
|
|
9d69882cf3
|
removed BaseDbContext
|
2022-07-29 15:53:29 +03:00 |
|
|
dba122eb96
|
Common, files: added dbcontext pool
|
2022-07-28 21:00:49 +03:00 |
|
|
a5f4435b17
|
fix notify
|
2022-07-20 22:06:33 +03:00 |
|
|
a289f9594a
|
modified LdapNotifyHelper to BackgroundService
|
2022-07-01 14:49:59 +03:00 |
|
Vashchuk Nikita
|
c1097acbb8
|
fix static, braces, log
|
2022-06-15 15:39:37 +03:00 |
|
Vashchuk Nikita
|
8410299051
|
modified logging
|
2022-06-08 12:42:49 +03:00 |
|
Nikita
|
1d2521c399
|
fix
|
2022-05-24 12:59:04 +03:00 |
|
Nikita
|
55a702bd2a
|
fix
|
2022-05-23 23:44:45 +03:00 |
|
Nikita
|
a7b9b77613
|
fix
|
2022-05-23 16:38:05 +03:00 |
|
Nikita
|
bb23b167a0
|
fix
|
2022-05-18 14:32:42 +03:00 |
|
Nikita
|
b1ad63cdac
|
fix
|
2022-05-18 13:54:13 +03:00 |
|
Nikita
|
77e435ede3
|
fix
|
2022-05-18 13:50:39 +03:00 |
|
Nikita
|
6451ac6329
|
fix
|
2022-05-18 13:36:35 +03:00 |
|
Nikita
|
787a1ba172
|
fix
|
2022-05-13 12:20:28 +03:00 |
|
Vashchuk Nikita
|
11ac66a1e0
|
refactoring
|
2022-05-05 16:23:05 +03:00 |
|
Vashchuk Nikita
|
4cab782bc8
|
Merge branch 'develop' into feature/LDAP-new
# Conflicts:
# ASC.Web.sln
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Program.cs
# web/ASC.Web.Api/Startup.cs
|
2022-04-28 09:41:09 +03:00 |
|
Vashchuk Nikita
|
a4e9cae742
|
changed work with disturbedTask
|
2022-04-26 17:03:41 +03:00 |
|
Vashchuk Nikita
|
2c4e6db03a
|
fix
|
2022-04-11 12:51:54 +03:00 |
|
Vashchuk Nikita
|
7f155066cf
|
fix
|
2022-04-08 13:44:18 +03:00 |
|
Vashchuk Nikita
|
3b6b4f15b2
|
fix
|
2022-03-29 15:23:16 +03:00 |
|
Vashchuk Nikita
|
6230dc5927
|
fix
|
2022-03-25 10:38:09 +03:00 |
|
Vashchuk Nikita
|
2d00909eef
|
added general context for ActiveDirectory
|
2022-03-24 16:18:34 +03:00 |
|
Vashchuk Nikita
|
b80dd40e81
|
fix
|
2022-03-22 13:37:44 +03:00 |
|
Vashchuk Nikita
|
a858ba68d3
|
fix
|
2022-03-18 12:36:35 +03:00 |
|
Vashchuk Nikita
|
a60b74c564
|
refactoring
|
2022-03-17 22:44:34 +03:00 |
|
Vashchuk Nikita
|
9c5f0d5fd9
|
fix
|
2022-03-15 11:11:39 +03:00 |
|
Vashchuk Nikita
|
8c2b5232a7
|
added ignored files
|
2022-03-14 21:58:06 +03:00 |
|
Vashchuk Nikita
|
38bf638352
|
fix lib
|
2022-03-14 19:29:35 +03:00 |
|
Vashchuk Nikita
|
49a14d7e6c
|
fix
|
2022-03-14 13:35:29 +03:00 |
|
Vashchuk Nikita
|
18bccade63
|
fix
|
2022-03-14 12:02:43 +03:00 |
|