Commit Graph

26361 Commits

Author SHA1 Message Date
8e87ad705f Web:Components:Add tag ReactSVG, add class third-party-tag. 2022-10-12 17:32:34 +03:00
7fe1fb4265 Web:Client:Change getThirdPartyIconSmall to getThirdPartyIcon. 2022-10-12 17:22:52 +03:00
cbbdb07b9c Web:Client:Delete method getThirdPartyIconSmall. 2022-10-12 17:22:19 +03:00
08379aeaa3 Web:Client:Delete small icons. 2022-10-12 17:21:42 +03:00
ac6c60ad17 Web:Client:Add dependence providers in method getFilterData. 2022-10-12 14:42:18 +03:00
f5e3e09a00 Web:Client:Add correct translation "ThirdPartyResource". 2022-10-12 13:48:26 +03:00
c51e42f2f4 Web:Client:Delete wrong translation "ThirdPartyResource". 2022-10-12 13:47:43 +03:00
7273fda06c Web:Common:Add props label, group in SelectedItem. 2022-10-12 13:37:09 +03:00
0a87f8988d Web:Client:Delete field isMultiSelect in thirdPartyOptions. 2022-10-12 13:35:49 +03:00
6d78f37729 Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-11 16:05:49 +03: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
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
6bf3720ace
Merge pull request #903 from ONLYOFFICE/feature/doc-space-info-panel
Feature/info panel udpate
2022-10-11 09:53:29 +03: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
7b3bd37f2c Web:Client:Add method onClickReconnectStorage, add object "reconnect-storage" in optionsModel in getFilesContextOptions in ContextOptionsStore. Add props isConnectDialogReconnect, setIsConnectDialogReconnect, saveAfterReconnectOAuth, setSaveAfterReconnectOAuth in ConnectDialog. Add changeable header, add toastr in saveThirdParty in ConnectDialog. 2022-10-10 19:24:23 +03:00
c5bba6a596 Web:Client:Add setIsConnectDialogReconnect, setSaveAfterReconnectOAuth, saveAfterReconnectOAuth, isConnectDialogReconnect. 2022-10-10 19:16:40 +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
ec45c0b4c7 Web:Client:Add "reconnect-storage" in roomOptions. 2022-10-10 19:15:16 +03:00
16dc28d6b2 Web:Client:Moved getting connectItems to ThirdPartyStore. 2022-10-10 19:14:33 +03:00
60b9ed3dd1 Web:Add translation "ReconnectStorage". 2022-10-10 19:13:01 +03:00
49d6884502 Web:Client:Add translation "SuccessfulConnectionOfAThirdParty". 2022-10-10 19:12:26 +03:00
b018be53f9 Web:Client:Add reconnect image. 2022-10-10 19:11:37 +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
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
mushka
513f1aab67 deleted unused console.log 2022-10-10 15:01:44 +03:00
mushka
7551b5c271 fixed historyBlockMessage crashing on empty selection 2022-10-10 14:58:53 +03:00