Commit Graph

10452 Commits

Author SHA1 Message Date
e3a093935d Files: archived rooms are readonly 2022-10-21 12:57:32 +03:00
a0975f1d98 Files: added archive folder display for free users 2022-10-21 12:55:54 +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
be8b455718 Files: UsersInRoom feature 2022-10-18 17:12:35 +03:00
1a5c273825 refactor 2022-10-18 14:43:31 +03:00
a2d144514d refactor 2022-10-18 14:22:02 +03:00
6c476010fd Files: fix file lock 2022-10-17 18:30:51 +03:00
a1ee600ae6 Files: fix security 2022-10-17 18:21:40 +03:00
9ed0b00594 Merge branch 'develop' into feature/rights-rework 2022-10-17 12:58:06 +03:00
a9a02cb0d5 Files: changed sharing rules 2022-10-17 12:56:51 +03:00
ddcb1f4789 Files: removed archiving for room admin 2022-10-17 12:56:26 +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
5a7d46a6fd Files: hid trash for user 2022-10-13 15:34:35 +03:00
8baaa2b83e Files: fix for visiotor 2022-10-13 15:26:12 +03:00
44149d47b7 Users: trash, favorites, recent folders 2022-10-12 18:53:48 +03:00
e3e6062e23 Files: fix creating tags for room administrators 2022-10-12 18:08:27 +03:00
39d101c95d Files: fix unarchiving room for room administrator 2022-10-12 18:08:06 +03:00
f23b5efb52 Files: fix 2022-10-12 17:05:12 +03:00
b8486d22de Merge branch 'develop' into feature/rights-rework 2022-10-12 14:03:36 +03:00
61a977b972 Files: hide archive for visitors 2022-10-11 17:59:40 +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
cc0f93603f Files: fix room admin rights 2022-10-06 16:10:30 +03:00
bfdfd371cf fix 2022-10-06 14:57:50 +03:00
8f3cfca11f Files: updated permissions for room administrators 2022-10-05 15:32:22 +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
d7e17828e0 Files: added additional parameters to feed 2022-09-23 14:57:04 +03:00
727175f571 Files: fix 2022-09-23 14:55:35 +03:00