Commit Graph

223 Commits

Author SHA1 Message Date
2b001f56d6 Web: Added transparency when a component is unavailable. 2022-10-05 12:18:25 +03:00
c3c64d847c Web: removed useless translations. 2022-10-05 11:55:15 +03:00
ca1cd06fad Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/public/images/plus.react.svg
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/components/PrivateRoute/index.js
2022-10-04 17:13:46 +03:00
TimofeyBoyko
019745b090 Web:Common:Article: open profile on avatar click 2022-10-04 07:31:06 +03:00
955a9379de Web: Ipad: fixed Safari styles 2022-09-29 17:29:09 +03:00
26af985bd4 Web: Common: fixed floating button display for safari browser 2022-09-29 14:09:35 +03:00
7164d4b25c
Merge pull request #861 from ONLYOFFICE/bugfix/restore-portal
Bugfix/restore portal
2022-09-27 10:41:55 +03:00
58def6cbb2 Web: Common: HideArticleMenuButton: fixed z-index 2022-09-26 16:11:22 +03:00
d59bd852d2 Web: Common: fixed HideArticleMenuButton styles for table view 2022-09-26 14:57:27 +03:00
0b66a94bbb Merge branch 'develop' into bugfix/restore-portal 2022-09-26 14:50:40 +03:00
56c4c35ca0
Merge pull request #858 from ONLYOFFICE/feature/added-show-article-button
Feature/added show article button
2022-09-26 12:52:14 +03:00
1f5384dc0c Web: Common: added hide menu translation 2022-09-26 12:37:21 +03:00
db047d72a9 Web: Common: removed log 2022-09-26 11:24:28 +03:00
0c8703a58c Web: Common: added show/hide article button 2022-09-26 11:22:46 +03:00
46370b588c Web: Fixed bugs. 2022-09-26 11:19:10 +03:00
80be6fafec Web:Common:Add isEmptyPage, delete isPageWithoutFiles. 2022-09-25 12:32:06 +03:00
94c945718c Web: Common: Access to the portal recovery page is denied when the portal is not being restored. 2022-09-24 10:46:02 +03:00
b97d4d8148 Web:Common:Add isPageWithoutFiles props. 2022-09-23 19:47:40 +03:00
f1150f6748 Merge branch 'bugfix/section-header' of github.com:ONLYOFFICE/AppServer into bugfix/section-header 2022-09-23 17:14:16 +03:00
5f00094d1a Web: Common: Changed padding style of section header. 2022-09-23 17:14:06 +03:00
9afa3de331
Merge branch 'develop' into bugfix/section-header 2022-09-23 16:48:30 +03:00
7f1d946269 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
#	packages/client/src/pages/PortalSettings/index.js
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
2022-09-23 16:11:23 +03:00
d804bf848a Web: Common: Fixed section header for iOS. 2022-09-23 16:10:55 +03:00
c2ab59c2ff
Merge branch 'develop' into feature/new-profile 2022-09-23 15:17:22 +03:00
389298dfd6 Web: Client: added theme to logo 2022-09-23 13:32:43 +03:00
2ed2f68cb6 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-22 12:48:46 +03:00
4189c9d912 Web: Added that access to the page of an inaccessible portal is denied if the portal is still paid. 2022-09-22 10:32:47 +03:00
ee42f4be3a Merge branch 'develop' into bugfix/trash-context-menu
# Conflicts:
#	packages/client/public/locales/en/Files.json
2022-09-21 17:18:42 +03:00
723a5709a6 Web: Common: fixed logo loader 2022-09-21 16:24:57 +03:00
TimofeyBoyko
94c7e24a94 Web:Common:Navigation: add context menu for trash folder 2022-09-21 15:58:52 +03:00
d9dd4c7139 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-21 13:52:51 +03:00
2b2aeea246 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-21 12:48:03 +03:00
31458b11e5
Merge branch 'develop' into bugfix/fixed-settings-loaders 2022-09-21 12:32:57 +03:00
c9f3dd8970 Merge branch 'feature/archived-redesign-empty-screen' of github.com:ONLYOFFICE/AppServer into feature/archived-redesign-empty-screen 2022-09-21 12:14:50 +03:00
e38bc40de6 Web:Common:Fix StyledHeading for isMobile. 2022-09-21 12:14:44 +03:00
f49e714bf0 Web: Common: Moved isEmptyPage out of Section 2022-09-21 12:05:42 +03:00
ffabcea9d6
Merge branch 'develop' into feature/archived-redesign-empty-screen 2022-09-21 11:07:04 +03:00
6372477fea Web:Common:Add tablet, smallTablet in media. 2022-09-21 10:25:26 +03:00
6f003a8459 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-20 21:54:33 +03:00
f49d98d21d Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
#	packages/client/src/Shell.jsx
2022-09-20 14:27:39 +03:00
TimofeyBoyko
e48371ba7f Merge branch 'develop' into bugfix/tags 2022-09-20 14:13:33 +03:00
TimofeyBoyko
72f7b984f2 Web:Common:Tags: fix truncate for 1 tag 2022-09-20 14:11:36 +03:00
3ff711225a
Merge branch 'develop' into feature/archived-redesign-empty-screen 2022-09-20 14:07:27 +03:00
6c1d1981a3 Web: Files: fixed plus icon click for shared folder 2022-09-20 14:00:34 +03:00
9fc617c652
Merge branch 'develop' into feature/archived-redesign-empty-screen 2022-09-20 13:52:31 +03:00
c61d11024c Web: Common: fixed burger loader 2022-09-20 11:26:14 +03:00
f36b38cbe5 Merge branch 'bugfix/fixed-settings-loaders' of github.com:ONLYOFFICE/AppServer into bugfix/fixed-settings-loaders 2022-09-20 10:59:41 +03:00
f607382b3a Web:Common:Delete isLoadedSetting, setIsLoadedArticleHeader. 2022-09-20 10:59:31 +03:00
ead5485288 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-19 23:30:28 +03:00
6448b63318 Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/constants/index.js
#	web/ASC.Web.Api/Program.cs
2022-09-19 18:16:34 +03:00