Commit Graph

2419 Commits

Author SHA1 Message Date
Viktor Fomin
1a06ea3787 Client: delete useless 2022-11-22 12:35:05 +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
TimofeyBoyko
8cdf2d2b8a Web:Client:NewFilesPanel: delete useless set state 2022-11-21 14:12:29 +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
Viktor Fomin
f95e6d2b86 Merge branch 'develop' into bugfix/whitelabel 2022-11-18 20:50:45 +05: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
5ed81e9433 Merge branch 'develop' into feature/catalog-redesign 2022-11-18 18:20:53 +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
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
e7a00955ef Web:Client:Add create tag for enter. 2022-11-18 15:01:24 +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
37952ee5b9 Web: Files: fixed display members tab for viewer 2022-11-18 14:05:22 +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
TimofeyBoyko
06b3bbe017 Web:Client:Home: fix header menu for archive 2022-11-18 13:08:22 +03:00
Viktor Fomin
9c7eae5be3 Merge branch 'develop' into bugfix/whitelabel 2022-11-18 14:47:21 +05:00
Viktor Fomin
dabf301a6d Client: PortalSettings: WhiteLabel: fix 2022-11-18 14:47:07 +05:00
46b514c09f Web: People: hid empty header menu 2022-11-18 12:09:29 +03:00
1157806abb Web: Files: hid empty header menu 2022-11-18 12:00:10 +03:00
bfae96c6e9 Web: Files: removed pin-to-top from archive 2022-11-18 11:59:25 +03:00
Akmal Isomadinov
8948460b58 Web:Client:Pages:Home:Section:Filter Added ids 2022-11-18 13:08:05 +05:00
Akmal Isomadinov
82e7745bfe Web:Client:Page:AccountsHome:Section:Filter: Added id 2022-11-18 13:06:47 +05:00
Viktor Fomin
6274f99540 Client: PortalSettings: WhiteLabel: restore default logo 2022-11-18 13:05:59 +05:00
Viktor Fomin
2cb754235f Client: PortalSettings: WhiteLabel: use text as logo 2022-11-18 07:01:07 +05:00
Viktor Fomin
5acd929895 Client: PortalSettings: Utils: add logo generator 2022-11-18 07:00:46 +05:00
Viktor Fomin
edaeeb9320 Client: PortalSettings: WhiteLabel: fix style 2022-11-18 03:30:02 +05:00
Viktor Fomin
6585031127 Client: PortalSettings: WhiteLabel: add save/cancel buttons 2022-11-18 03:23:01 +05:00
Viktor Fomin
b0b8cc07fa Client: PortalSettings: WhiteLabel: add editors logo 2022-11-18 03:21:36 +05:00
Viktor Fomin
24ab1ebc60 Client: PortalSettings: WhiteLabel: add favicon 2022-11-18 03:07:08 +05:00
Viktor Fomin
11e5a7d965 Client: PortalSettings: WhiteLabel: fix padding 2022-11-18 03:03:04 +05:00
Viktor Fomin
1ea594820c Client: PortalSettings: WhiteLabel: add about logo 2022-11-18 01:55:14 +05:00
Viktor Fomin
e803a0f298 Client: PortalSettings: WhiteLabel: add login logo 2022-11-18 01:52:52 +05:00
Viktor Fomin
96a3d72724 Client: PortalSettings: WhiteLabel: add compact logo 2022-11-18 01:46:26 +05:00
Viktor Fomin
fba8043a93 Client: PortalSettings: WhiteLabel: use translate 2022-11-18 01:39:53 +05:00
Viktor Fomin
2436f81935 Client: PortalSettings: WhiteLabel: move logo to component 2022-11-18 01:38:05 +05:00
Viktor Fomin
5e13be9b35 Client: PortalSettings: WhiteLabel: add logos 2022-11-18 00:57:54 +05:00
Viktor Fomin
0e739459e1 Client: PortalSettings: WhiteLabel: start refactoring 2022-11-18 00:30:14 +05:00