Commit Graph

10474 Commits

Author SHA1 Message Date
7a01578f0c
Merge pull request #939 from ONLYOFFICE/feature/remove-new-TenantQuotaController
remove  "new TenantQuotaController"
2022-10-31 13:03:28 +03:00
ef10f570f5 Files: fixed incorrect setting user type 2022-10-28 16:24:58 +03:00
0baa36c1c0 GetDataStore tenant string to int 2022-10-28 15:23:51 +03:00
78bd9f0e13 Merge branch 'develop' into feature/invite-accounts 2022-10-27 19:18:07 +03:00
06f8917b77 People: added link logging 2022-10-26 18:20:37 +03:00
f137df85cc People: added resend docspace invite 2022-10-26 18:16:46 +03:00
3e1b1bbe6a People: fix links security, refactor 2022-10-26 17:40:43 +03:00
fffde238d6 People: added employee type parameter 2022-10-26 17:39:44 +03:00
eb485d035a Api.Core: added employee type 2022-10-26 17:38:47 +03:00
3adb7d5e8e People: added api for inviting users 2022-10-25 23:18:07 +03:00
aa29906ab8 Files: fix 2022-10-25 16:37:52 +03:00
6fb1cc2115 Files: fix uploading files and folders to virtual rooms root 2022-10-24 14:41:54 +03:00
ac05302b21 Merge branch 'develop' into feature/rights-rework 2022-10-21 13:14:00 +03:00
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
6785bfb512 Files: check quota while unarchive room 2022-10-20 19:18:54 +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
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
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
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
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
cc0f93603f Files: fix room admin rights 2022-10-06 16:10:30 +03:00
bfdfd371cf fix 2022-10-06 14:57:50 +03:00