Commit Graph

1589 Commits

Author SHA1 Message Date
TimofeyBoyko
7d0fe8d9bc Web:Client:Files: delete useless code 2022-10-13 13:03:23 +05:00
TimofeyBoyko
c365bff254 Web:Client:UsersStore: add try catch for change type method 2022-10-13 13:01:34 +05:00
TimofeyBoyko
b9f4bb1e33 Web:Client: fix room admin access rights 2022-10-13 13:00:48 +05:00
TimofeyBoyko
bf9b084732 Web:Client:Article: delete useless code 2022-10-13 12:44:50 +05:00
TimofeyBoyko
20676d2cc9 Web:Client:ProfileActionsStore: return checkEnabledActions for profile menu 2022-10-13 12:22:39 +05:00
TimofeyBoyko
7f72382d32 Web:Client:Article: fix interface jumping after change files root folder to room 2022-10-13 12:22:09 +05:00
TimofeyBoyko
9750335b3e Merge branch 'develop' into feature/portal-access-rights 2022-10-13 11:45:31 +05:00
TimofeyBoyko
3ac94b3440 Web:Client:Settings: fix common files settings for free user 2022-10-12 19:15:44 +05:00
TimofeyBoyko
919eb57cec Web:Client:Article: hide main button for free user for all pages 2022-10-12 19:13:30 +05:00
71794c760b
Merge pull request #906 from ONLYOFFICE/bugfix/info-panel-in-recycle-bin-folder
Bugfix/info panel in recycle bin folder
2022-10-12 16:11:37 +03:00
d19639f7c0 Web: PortalSettings: Removed useless code after merge. 2022-10-12 16:04:05 +03:00
4d4a09d8e7 Web: The edit button has been removed. 2022-10-12 16:03:19 +03:00
TimofeyBoyko
a9f2815ca0 Web:Client:EmptyScreen: disable create room for free user 2022-10-12 18:01:21 +05:00
TimofeyBoyko
a66d3c3e15 Web:Client:Section: disable create room for free user 2022-10-12 17:58:16 +05:00
TimofeyBoyko
ae38e98de3 Web:Client:Files: disable trash route for free user 2022-10-12 17:55:28 +05:00
905e98450d Web: Client: fixed header jumps 2022-10-12 14:59:41 +03:00
TimofeyBoyko
4aa2c7d7b8 Web:Client:UsersStore: fix change admins method 2022-10-12 16:57:17 +05:00
TimofeyBoyko
43e9806553 Merge branch 'develop' into feature/portal-access-rights 2022-10-12 16:16:59 +05:00
TimofeyBoyko
a8233427b7 Web:Client:Profile: fix profile menu 2022-10-12 16:12:38 +05:00
TimofeyBoyko
c2752c0a59 Web:Client:Files: add /settings/admins for room admins 2022-10-12 16:12:14 +05:00
TimofeyBoyko
a09e4dab08 Web:Cliet:Accounnts: add available room admin invaite room admin 2022-10-12 15:53:54 +05:00
TimofeyBoyko
9899674836 Web:Client:Store: rework cotext menu at accounts 2022-10-12 15:51:08 +05:00
TimofeyBoyko
f7ec554482 Web:Client:Accounts: fix routes for room admins 2022-10-12 15:42:32 +05:00
TimofeyBoyko
b4c01612d3 Web:Client:Profile: fix back button for room admins 2022-10-12 15:42:05 +05:00
TimofeyBoyko
c97a5a5468 Web:Client:Article: fix files article header 2022-10-12 15:41:34 +05:00
TimofeyBoyko
e0ae104453 Web:Client:Accounts: delete useless code 2022-10-12 14:31:58 +05:00
TimofeyBoyko
041c41892b Web:Client:Accounts: fix dialog and methods for change user type 2022-10-12 14:30:58 +05:00
TimofeyBoyko
2605d6f2f5 Web:Client:Locales: add new translation key for 'ChangeUserTypeDialog' 2022-10-12 14:30:15 +05:00
TimofeyBoyko
3f1dc486b1 Web:Client:Accounts: disable change type for disabling users and fix status for user at info-panel 2022-10-12 13:17:00 +05:00
c11e1e489d Web: PortalSettings: Removed the touch selection. 2022-10-11 16:43:52 +03:00
4f9d126f73 Web: PortalSettings: Added missed prop. 2022-10-11 16:40:56 +03:00
0231a501c0 Web: Removed dialog duplication. 2022-10-11 16:39:26 +03:00
69c5a50fa9 Web: PortalSettings: Added missed prop. 2022-10-11 16:13:07 +03:00
TimofeyBoyko
0540e6fce7 Web:Client: add manager user type for DocSpace 2022-10-11 16:11:37 +05:00
1515c95af4 Web: Fixed styles. 2022-10-11 13:03:55 +03:00
2f64da592e Merge branch 'develop' into bugfix/backup 2022-10-11 12:52:13 +03:00
TimofeyBoyko
7a1ddd3c20 Merge branch 'develop' into feature/portal-access-rights 2022-10-11 14:04:42 +05:00
cf2547e030 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/common/constants/index.js
2022-10-11 10:20:42 +03:00
0d7f77a18a
Merge pull request #897 from ONLYOFFICE/bugfix/accounts-filter
Bugfix/accounts filter
2022-10-11 10:12:57 +03:00
TimofeyBoyko
fe8b7ec257 Web:Client: add 'DocSpaceAdmin' translation key 2022-10-11 12:12:38 +05:00
TimofeyBoyko
4f03d67b58 Web:Client:InfoPanel: fix user role 2022-10-11 12:05:58 +05:00
TimofeyBoyko
da14ffd656 Merge branch 'develop' into feature/portal-access-rights 2022-10-11 11:52:34 +05: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
0608694746 fixed account email text truncation 2022-10-10 18:47:33 +03:00
mushka
edb3f894f6 fixed selected folder path parts error 2022-10-10 18:38:52 +03:00
mushka
415c620574 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-10 17:27:16 +03:00
mushka
946c4a8408 selectionParentRoom setting mechanism fix 2022-10-10 17:21:43 +03:00
TimofeyBoyko
998c06d0ea Merge branch 'develop' into feature/portal-access-rights 2022-10-10 19:04:53 +05:00
TimofeyBoyko
2bafe2c590 Web:Client: disable 'Move to' button to the current folder 2022-10-10 18:59:28 +05:00
TimofeyBoyko
0e9ccf9f12 Web:Client: disable 'Move to' button to the current folder 2022-10-10 18:58:49 +05:00