Commit Graph

28053 Commits

Author SHA1 Message Date
Viktor Fomin
248b2017ad Common: API: delete useless 2022-11-22 12:34:57 +05:00
60284ff9e0
Merge pull request #1068 from ONLYOFFICE/bugfix/whitelabel
Bugfix/whitelabel
2022-11-22 12:26:18 +05:00
Viktor Fomin
a54341871e Merge branch 'develop' into bugfix/whitelabel 2022-11-21 23:46:04 +05:00
9ae8273954
Merge pull request #1060 from ONLYOFFICE/hotfix/fileOperation
Hotfix/file operation
2022-11-21 16:41:31 +03:00
7132f3e351 fix 2022-11-21 16:35:20 +03:00
85d6972fa2
Merge pull request #1063 from ONLYOFFICE/bugfix/fix-new-files-panel
Bugfix/fix new files panel
2022-11-21 14:15:34 +03:00
TimofeyBoyko
8cdf2d2b8a Web:Client:NewFilesPanel: delete useless set state 2022-11-21 14:12:29 +03:00
TimofeyBoyko
a78e3ef29f Web:Common:DialogAsideLoader: delete useless code 2022-11-21 13:48:56 +03:00
TimofeyBoyko
12e8686839 Web:Common:DialogAsideLoader: fix styles 2022-11-21 13:45:36 +03:00
TimofeyBoyko
c6add5cd67 Web:Client:Article: disable multi click on new files badge 2022-11-21 13:45:36 +03:00
TimofeyBoyko
5a9e66bd09 Web:Client:HOCs: fix multi click for unpin and new files badges 2022-11-21 13:45:36 +03:00
TimofeyBoyko
b42b39f888 Web:Client:NewFilesPanel: fix double request and negative new files count 2022-11-21 13:45:36 +03:00
Viktor Fomin
7db84753b7 Client: PortalSettings: WhiteLabel: add logo options 2022-11-21 13:56:29 +05:00
9a03f19b62 add semaphore 2022-11-19 05:40:13 +03:00
e940da5480 fix fileOperation 2022-11-19 05:40:00 +03:00
Viktor Fomin
f95e6d2b86 Merge branch 'develop' into bugfix/whitelabel 2022-11-18 20:50:45 +05:00
ec35693308
Merge pull request #1059 from ONLYOFFICE/bugfix/fix-info-panel
Web:Common:Add close InfoPanel for unmounting a component.
2022-11-18 18:33:41 +03:00
35691a9763
Merge pull request #1058 from ONLYOFFICE/bugfix/fix-create-tag
Web:Client:Add create tag for enter.
2022-11-18 18:31:58 +03:00
b700db24f9 Merge branch 'develop' into bugfix/fix-create-tag 2022-11-18 18:28:25 +03:00
9982cae3c0
Merge pull request #1054 from ONLYOFFICE/bugfix/additional-resources
bugfix/additional-resources
2022-11-18 18:27:02 +03:00
a6cbc91727
Merge pull request #1046 from ONLYOFFICE/feature/catalog-redesign
Feature/catalog redesign
2022-11-18 18:23:24 +03:00
5ed81e9433 Merge branch 'develop' into feature/catalog-redesign 2022-11-18 18:20:53 +03:00
e4dd226666
Merge pull request #1053 from ONLYOFFICE/bugfix/fix-sso-loader
Web:Client:Add SSOLoader in ToggleSSO.
2022-11-18 18:20:09 +03:00
dee6ba8f60 Web: Common: fixed article loader 2022-11-18 18:17:17 +03:00
cb3729b0bc Merge branch 'develop' into bugfix/fix-sso-loader 2022-11-18 18:11:53 +03:00
784abbe39e Merge branch 'develop' into feature/catalog-redesign 2022-11-18 17:49:57 +03:00
b6f6c49801
Merge pull request #1050 from ONLYOFFICE/feature/Add-id-for-filter
Feature/add id for filter
2022-11-18 17:46:19 +03:00
Akmal Isomadinov
b65f887f6b Web:Common:Components:FilterInput: Updated id 2022-11-18 19:43:03 +05:00
Akmal Isomadinov
038eb30a9f Web:Components:View-Selector: Removed id 2022-11-18 19:17:11 +05:00
Akmal Isomadinov
7266f8ebb2 Web:Common:Components:FilterInput: Refactoring id 2022-11-18 19:16:45 +05:00
Akmal Isomadinov
2652f0c800 Web:Components:Combobox Removed id 2022-11-18 19:15:48 +05:00
Akmal Isomadinov
01b97ee52f Web:Client:Pages:AccountsHome:Section:Filter: Updated id 2022-11-18 19:14:56 +05:00
35e22fe8c8 Merge branch 'develop' into feature/fix-whitelable
# Conflicts:
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Core/LogoUploader.cs
#	web/ASC.Web.Core/PublicResources/Resource.resx
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-11-18 16:48:19 +03:00
f445ff6a6a Merge branch 'develop' into feature/Add-id-for-filter 2022-11-18 16:47:39 +03:00
36798c4241 Web:Common:Add close InfoPanel for unmounting a component. 2022-11-18 15:48:50 +03:00
e7a00955ef Web:Client:Add create tag for enter. 2022-11-18 15:01:24 +03:00
0230776f18
Merge pull request #1057 from ONLYOFFICE/bugfix/fix-unarchive-action
Web:Common:Api: fix request body for unarchive
2022-11-18 14:56:45 +03:00
TimofeyBoyko
1eaa81b43b Web:Common:Api: fix request body for unarchive 2022-11-18 14:53:09 +03:00
43d94955e1
Merge pull request #1056 from ONLYOFFICE/bugfix/fix-archived-empty-screen
Web:Client:EmptyContainer: fix empty screen for archived room
2022-11-18 14:42:39 +03:00
TimofeyBoyko
0e822663ae Web:Client:EmptyContainer: fix empty screen for archived room 2022-11-18 14:34:43 +03:00
Viktor Fomin
64469e0bb8 Merge branch 'develop' into bugfix/additional-resources 2022-11-18 16:11:14 +05:00
5e05093a89
Merge pull request #1055 from ONLYOFFICE/bugfix/fixed-info-panel-tabs-view
Bugfix/fixed info panel tabs view
2022-11-18 14:10:34 +03:00
37952ee5b9 Web: Files: fixed display members tab for viewer 2022-11-18 14:05:22 +03:00
d29088c33f Web: Common: added getArchiveRoomRoleActions 2022-11-18 14:04:29 +03:00
Viktor Fomin
fe4f36c902 Client: ProfileActionsStore: fix keys 2022-11-18 16:01:35 +05:00
0caddaaca2
Merge pull request #1052 from ONLYOFFICE/bugfix/fix-archived-header-context-menu
Bugfix/fix archived header context menu
2022-11-18 13:47:31 +03:00
3fc6f847f5 Web:Client:Add SSOLoader in ToggleSSO. 2022-11-18 13:47:21 +03:00
2a483e6eb3 Fix Cannot read properties of undefined (reading 'rootFolderType') 2022-11-18 13:20:54 +03:00
TimofeyBoyko
4dcb0fcab1 Web:Client:Home: delete useless code 2022-11-18 13:12:07 +03:00
TimofeyBoyko
afc18b4a03 Merge branch 'develop' into bugfix/fix-archived-header-context-menu 2022-11-18 13:09:07 +03:00