Commit Graph

1559 Commits

Author SHA1 Message Date
mushka
b05b8c90af passed room title to thirdparty storage 2022-10-18 01:57:02 +03:00
mushka
2f7f136705 renamed storageFolderId value in roomParams 2022-10-18 01:56:39 +03:00
mushka
3008e549c9 fixed some small translation issues with info panel 2022-10-18 01:55:45 +03:00
mushka
6055e4db6b Merge branch 'develop' into feature/room-thirdparty-update 2022-10-13 17:56:39 +03:00
mushka
7b25edd7d0 added mechanism of deleting thirdparty connection on with room creation if isThirdparty param not chosen 2022-10-13 17:40:47 +03:00
mushka
d9639f8971 added mechanism of deleting thirdparty connection on room creation cancelling 2022-10-13 17:39:24 +03:00
mushka
05838f3bc5 added mechanism of deleting thirdparty connection on provider change 2022-10-13 17:39:00 +03:00
mushka
43c3a05126 imporved props passing in ThirdPartyStorage index file 2022-10-13 17:38:31 +03:00
mushka
31994bcfda uipdated props passing in CreateRoomDialog 2022-10-13 15:15:31 +03:00
mushka
d36d9a7596 moved store injects to ThirdpartyStorege/index.js 2022-10-13 15:14:57 +03:00
mushka
3b32f8c978 updaed oAuth autentification - now works without middleman modal window 2022-10-13 15:14:28 +03:00
mushka
5fc1ec252d started moving imports for thirdparty manipulation to ThirdpartyStorega/index.js 2022-10-13 15:13:42 +03:00
mushka
319d842312 fixed MakeRoomPrivateLimitationsWarningDescription translate key in russian 2022-10-13 15:12:58 +03:00
4302361963 Web: Client: fixed header styles 2022-10-13 12:52:11 +03:00
db926fee0e Web: Files: fixed header context-menu 2022-10-13 12:51:40 +03: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
905e98450d Web: Client: fixed header jumps 2022-10-12 14:59:41 +03: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
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
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
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
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
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
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
mushka
36c6372a53 fixed issue with equal root folder and file ids 2022-10-10 14:57:42 +03:00
TimofeyBoyko
b6cf14f62e Merge branch 'develop' into bugfix/accounts-filter 2022-10-10 14:57:56 +05:00
9be67022ab Web: Deleted useless code. 2022-10-10 12:08:53 +03:00
770c414c93
Merge pull request #883 from ONLYOFFICE/bugfix/branding-loader
Bugfix/branding loader
2022-10-10 12:07:50 +03:00
8aa7d5d549 Web: Fixed errors connecting and disconnecting accounts. 2022-10-10 12:03:14 +03:00
TimofeyBoyko
9a831cd2bf Web:Client: fix filter header translation key 2022-10-10 14:01:27 +05:00
TimofeyBoyko
09dbd9d088 Web: move translation key 'AdvancedFilter' from Files to Common 2022-10-10 13:53:24 +05:00
c908c0e0ea Web: Added error message output. 2022-10-10 10:45:38 +03:00
mushka
cd63f5c6d4 added mechanism that removes all left-out separators from context menu after show-info key deletion 2022-10-07 20:15:15 +03:00