Commit Graph

26351 Commits

Author SHA1 Message Date
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
bd396fb9af Web:Common:PrivateRoute: fix restricted routes for room admins 2022-10-12 15:41:13 +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
TimofeyBoyko
916730b0c4 Merge branch 'develop' into feature/portal-access-rights 2022-10-11 16:12:45 +05:00
TimofeyBoyko
0540e6fce7 Web:Client: add manager user type for DocSpace 2022-10-11 16:11:37 +05:00
TimofeyBoyko
e3b4979daa Web:Common:Api: update user roles 2022-10-11 16:07:36 +05:00
TimofeyBoyko
d557354690 Web:Components:Avatar: add new role 'manager' 2022-10-11 15:22:11 +05:00
9d050b0c6a fix 2022-10-11 13:14:50 +03:00
Sergey Kirichenko
8d528450dc
Modify root path (#904) 2022-10-11 12:44:22 +03:00
TimofeyBoyko
7a1ddd3c20 Merge branch 'develop' into feature/portal-access-rights 2022-10-11 14:04:42 +05:00
538300d205
Merge pull request #886 from ONLYOFFICE/feature/stripe
Feature/stripe
2022-10-11 11:56:09 +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
f013c74475 Web: Added additional units for measuring the amount of information, added verification. 2022-10-11 10:58:10 +03: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
6bf3720ace
Merge pull request #903 from ONLYOFFICE/feature/doc-space-info-panel
Feature/info panel udpate
2022-10-11 09:53:29 +03:00
TimofeyBoyko
da14ffd656 Merge branch 'develop' into feature/portal-access-rights 2022-10-11 11:52:34 +05:00
mushka
09ece8865d removed old unused methods 2022-10-11 09:51:21 +03:00
8e3826bd71
Merge pull request #699 from ONLYOFFICE/feature/doc-space-info-panel
InfoPanel for DocSpace
2022-10-10 21:18:11 +03:00
190ee44952 fix 2022-10-10 19:52:12 +03:00
mushka
0da82b28eb added mechanism of searcing an account on its link click 2022-10-10 19:41:09 +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
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
mushka
be3bb23144 fixed loader error in accounts 2022-10-10 17:19:19 +03:00
TimofeyBoyko
998c06d0ea Merge branch 'develop' into feature/portal-access-rights 2022-10-10 19:04:53 +05:00
b12f7a5696
Merge pull request #901 from ONLYOFFICE/bugfix/block-move-to-button
Bugfix/block move to button
2022-10-10 17:04:48 +03: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
TimofeyBoyko
cebab845cd Merge branch 'develop' into bugfix/block-move-to-button 2022-10-10 18:32:19 +05:00
49ccd70e8e
Merge pull request #889 from ONLYOFFICE/feature/two-factor-authentication
Feature/two factor authentication
2022-10-10 16:25:03 +03:00
TimofeyBoyko
df103904d5 Web:Client:Components: disable move to button of selection panel body while loading folders tree 2022-10-10 18:20:28 +05:00
mushka
27d7f9678f fixed openLocationAction not defined issue on opne file location from history 2022-10-10 16:14:49 +03:00
mushka
f6f6bd871e fixed members blinking on room change 2022-10-10 16:02:36 +03:00
f61a303e01
Merge pull request #900 from ONLYOFFICE/bugfix/fixed-combo-box-styles
Web: Components: fixed combo-button
2022-10-10 15:59:17 +03:00
19e336f734 Web: Components: fixed combo-button 2022-10-10 15:57:38 +03:00
91ba9d1147
Merge pull request #899 from ONLYOFFICE/bugfix/fixed-action-button
Web: Common: fixed action button styles, removed useless code
2022-10-10 15:30:37 +03:00
368a23fd4e Web: Common: fixed action button styles, removed useless code 2022-10-10 15:11:43 +03:00