|
c3c19aba39
|
fix migration
|
2022-11-07 13:43:49 +03:00 |
|
|
ca85ef1d49
|
fix usings
|
2022-11-07 12:34:50 +03:00 |
|
|
14a64f4ad0
|
Merge branch 'develop' into feature/remove-waste
# Conflicts:
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Program.cs
# common/services/ASC.ApiSystem/Startup.cs
# products/ASC.CRM/Server/Classes/Global.cs
# products/ASC.Files/Server/ProductEntryPoint.cs
# web/ASC.Web.Core/QuotaSync.cs
|
2022-11-07 11:25:54 +03:00 |
|
|
e5393096a7
|
Merge pull request #972 from ONLYOFFICE/bugfix/rooms
Bugfix/rooms
|
2022-11-02 19:05:17 +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 |
|
|
d450457703
|
removed unnecessary call when inviting a user that reduces performance
|
2022-11-01 14:06:31 +03:00 |
|
|
78bd9f0e13
|
Merge branch 'develop' into feature/invite-accounts
|
2022-10-27 19:18:07 +03:00 |
|
|
fa9dd5bd94
|
rename singnalR to socket
|
2022-10-27 15:37:26 +03:00 |
|
|
d54a2fc79e
|
rename file
|
2022-10-27 15:33:06 +03:00 |
|
|
37e52ea733
|
Core.Common: fix for invated users
|
2022-10-25 23:16:54 +03:00 |
|
|
22d800afcd
|
Core.Common: added new type
|
2022-10-25 23:15:57 +03:00 |
|
|
972d66e4ea
|
Core.Common: fix invalidate cache
|
2022-10-25 23:15:35 +03:00 |
|
|
128527a809
|
Merge branch 'develop' into feature/recalculate-user-quota
|
2022-10-25 17:33:56 +03:00 |
|
|
ac05302b21
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-21 13:14:00 +03:00 |
|
|
60f2393940
|
Quota: fix
|
2022-10-20 14:53:38 +03:00 |
|
|
f01376cc56
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-20 11:24:20 +03:00 |
|
|
35592fd306
|
Quota: fix
|
2022-10-19 19:27:04 +03:00 |
|
|
ea86b81c7e
|
Quota: fix
|
2022-10-19 18:04:31 +03:00 |
|
|
0a955950e6
|
fix
|
2022-10-19 17:11:52 +03:00 |
|
|
2b95553037
|
another fix quota
|
2022-10-19 16:22:13 +03:00 |
|
|
22a24de659
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-19 15:31:14 +03:00 |
|
|
0ad23f779c
|
fix quota
|
2022-10-19 14:53:56 +03:00 |
|
|
afc9d1ce17
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-19 14:18:52 +03:00 |
|
|
16bb42d0af
|
fix ASC.Data.Storage.Encryption
|
2022-10-19 13:12:33 +03:00 |
|
|
4e0d77a239
|
fix wizard
|
2022-10-19 12:48:23 +03:00 |
|
|
9df8c0d69f
|
Quota: fix
|
2022-10-18 21:37:16 +03:00 |
|
|
a2afba0a28
|
Quota: fix
|
2022-10-18 18:13:35 +03:00 |
|
|
1a5c273825
|
refactor
|
2022-10-18 14:43:31 +03:00 |
|
|
7af080486c
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-18 14:32:17 +03:00 |
|
|
a2d144514d
|
refactor
|
2022-10-18 14:22:02 +03:00 |
|
|
c938a98d00
|
fix ValidateDomain
|
2022-10-17 17:48:41 +03:00 |
|
|
65a066b61e
|
fix merge
|
2022-10-17 16:21:09 +03:00 |
|
|
ed22136269
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-17 14:31:57 +03:00 |
|
|
7280d2d52b
|
Merge branch 'develop' into feature/recalculate-user-quota
|
2022-10-17 14:20:31 +03:00 |
|
|
19ad5b0ef2
|
fix api system
|
2022-10-17 12:15:44 +03:00 |
|
|
e2ccab3c97
|
ApiSystem: fix
|
2022-10-14 17:52:00 +03:00 |
|
|
cd25dcc8b3
|
Merge branch 'develop' into feature/apisystem
|
2022-10-14 11:27:19 +03:00 |
|
|
d6441948f3
|
Quota: fix
|
2022-10-13 18:12:04 +03:00 |
|
|
21075fd4c3
|
Quota: fix
|
2022-10-13 17:45:09 +03:00 |
|
|
c7fbe5d87c
|
Billing: fix cache
|
2022-10-13 12:30:24 +03:00 |
|
|
1c5bea4fcc
|
fix cache
|
2022-10-12 17:02:07 +03:00 |
|
|
dc2cfbc614
|
Merge branch 'develop' into feature/apisystem
# Conflicts:
# web/ASC.Web.Core/PublicResources/Resource.resx
|
2022-10-11 13:53:31 +03:00 |
|
|
9d050b0c6a
|
fix
|
2022-10-11 13:14:50 +03:00 |
|
|
b160c16fc2
|
creating rooms and users feature available only for paid portals
|
2022-10-11 11:02:43 +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 |
|
|
e3bcada474
|
fix
|
2022-10-07 16:49:03 +03:00 |
|
|
c8e6578c11
|
fix
|
2022-10-07 16:48:06 +03:00 |
|
|
5b96dbdb55
|
removed DbUsersQuotaRow
|
2022-10-07 16:37:57 +03:00 |
|
|
4ebd5323c0
|
Quota: fix
|
2022-10-06 15:55:47 +03:00 |
|
|
143cc76066
|
fix
|
2022-10-06 12:01:43 +03:00 |
|