|
|
e197a7b506
|
Quota: fix
|
2022-10-28 17:35:22 +03:00 |
|
|
|
aac059274e
|
Quota: fix
|
2022-10-27 17:44:20 +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 |
|
|
|
b33d55cfe7
|
Quota: fix
|
2022-10-24 17:26:29 +03:00 |
|
|
|
6785bfb512
|
Files: check quota while unarchive room
|
2022-10-20 19:18:54 +03:00 |
|
|
|
60f2393940
|
Quota: fix
|
2022-10-20 14:53:38 +03:00 |
|
|
|
1f5605eb84
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-20 14:24:12 +03:00 |
|
|
|
2352ab01b6
|
Files: fix deleting folders from trash
|
2022-10-20 12:35:46 +03:00 |
|
|
|
9c99f3a53f
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-19 19:41:39 +03:00 |
|
|
|
ea86b81c7e
|
Quota: fix
|
2022-10-19 18:04:31 +03:00 |
|
|
|
ac0e87e581
|
Quota: fix
|
2022-10-19 14:48:48 +03:00 |
|
|
|
9df8c0d69f
|
Quota: fix
|
2022-10-18 21:37:16 +03:00 |
|
|
|
be8b455718
|
Files: UsersInRoom feature
|
2022-10-18 17:12:35 +03:00 |
|
|
|
7280d2d52b
|
Merge branch 'develop' into feature/recalculate-user-quota
|
2022-10-17 14:20:31 +03:00 |
|
|
|
a77b213f75
|
fix jwt
|
2022-10-17 11:39:59 +03:00 |
|
|
|
669a5116d5
|
Merge pull request #876 from ONLYOFFICE/feature/rooms-counter-new
Feature/rooms counter new
|
2022-10-14 19:23:38 +04:00 |
|
|
|
21075fd4c3
|
Quota: fix
|
2022-10-13 17:45:09 +03:00 |
|
|
|
efde1f00a9
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-13 13:37:05 +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 |
|
|
|
61a977b972
|
Files: hide archive for visitors
|
2022-10-11 17:59:40 +03:00 |
|
|
|
6d78f37729
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-11 16:05:49 +03:00 |
|
|
|
fcabf8b73c
|
fix
|
2022-10-11 11:13:22 +03:00 |
|
|
|
b160c16fc2
|
creating rooms and users feature available only for paid portals
|
2022-10-11 11:02:43 +03:00 |
|
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +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 |
|
mushka
|
8e2335416a
|
removed unused file
|
2022-10-07 18:55:26 +03:00 |
|
mushka
|
aecc841e55
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-07 17:15:15 +03:00 |
|
|
|
5b96dbdb55
|
removed DbUsersQuotaRow
|
2022-10-07 16:37:57 +03:00 |
|
|
|
bfdfd371cf
|
fix
|
2022-10-06 14:57:50 +03:00 |
|
|
|
20e37c254d
|
Files: added parameter for filtering by provider
|
2022-10-03 17:56:54 +03:00 |
|
|
|
627e6b75fc
|
Files: fix
|
2022-10-03 12:15:20 +03:00 |
|
|
|
8f7216d506
|
Files: added room filtering by provider type
|
2022-10-03 11:45:02 +03:00 |
|
|
|
1618d0cd39
|
Files: fix
|
2022-10-03 10:09:46 +03:00 |
|
|
|
e2fc3476b2
|
Files: fix favorites
|
2022-09-30 14:21:43 +03:00 |
|
|
|
ff6c83e7ef
|
Files: fix tags
|
2022-09-30 14:21:33 +03:00 |
|
|
|
3e9470b64c
|
Files: fix
|
2022-09-29 18:29:11 +03:00 |
|
|
|
8b8b213090
|
Files: fix
|
2022-09-28 18:02:45 +03:00 |
|
|
|
ac5739f235
|
Files: fix for thirdparty
|
2022-09-28 14:11:50 +03:00 |
|
|
|
e098cc372b
|
Files: added new default share for rooms, refactor
|
2022-09-27 23:16:00 +03:00 |
|
|
|
03e99082df
|
Files: fix counting
|
2022-09-27 23:14:59 +03:00 |
|
|
|
ed42050de3
|
Merge branch 'feature/feed' into feature/doc-space-info-panel
|
2022-09-26 11:14:35 +03:00 |
|
mushka
|
af16f21d4a
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-26 11:00:34 +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 |
|
|
|
101e30b364
|
Files: added large room logo, refactor
|
2022-09-23 16:37:04 +03:00 |
|
|
|
fffdc56a80
|
fix
|
2022-09-23 16:22:02 +03:00 |
|
|
|
7d19f090fb
|
Feed: refactor
|
2022-09-23 16:19:17 +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 |
|
