Commit Graph

76 Commits

Author SHA1 Message Date
Viktor Fomin
004aceda28 Common: Article: fix logo 2022-11-23 06:19:01 +05:00
Viktor Fomin
50c55f0e29 Common: fix logo 2022-11-22 13:06:07 +05:00
Akmal Isomadinov
f96d664904 Web:Common:Components:Article:Sub-Components: Updated id 2022-11-14 15:38:32 +05:00
Akmal Isomadinov
c6ac0e417c Web:Common:Components:Article:Sub-Components: Updated id 2022-11-14 15:19:03 +05:00
Akmal Isomadinov
94ea046a68 Web:Common:Components:Article:Sub-Components: Updated id 2022-11-14 15:15:51 +05:00
Akmal Isomadinov
d81ad1a7fe Web:Common:Components:Article:Sub-Components:Article-Payment-Alert: Update id 2022-11-14 13:04:18 +05:00
Akmal Isomadinov
e37776195a Web:Common:Components:Article:Sub-Components:Article-Hide-Menu-Button: Added identifiers to components 2022-11-14 13:04:18 +05:00
Akmal Isomadinov
bc942c568c Web:Common:Components:Article:Sub-Components:Article-Profile: Added id 2022-11-14 13:04:18 +05:00
Akmal Isomadinov
23faa6f5ee Web:Common:Components:Article:Sub-Components: Added id for test 2022-11-14 13:04:18 +05:00
Viktor Fomin
7bb4cc73b7 Common: Article: fix 2022-11-09 18:55:58 +05:00
Viktor Fomin
657ccbb7c8 Common: Article: add support color scheme 2022-11-07 16:58:53 +05:00
Viktor Fomin
1cb56a31fe Merge branch 'develop' into bugfix/smart-banner 2022-11-07 15:09:16 +05:00
d7abe3b9da
Merge pull request #963 from ONLYOFFICE/feature/whitelabel
Feature/whitelabel
2022-11-03 20:10:06 +03:00
Viktor Fomin
48c01a82fb Web: revert 2022-11-03 18:41:59 +05:00
6dd55c2643 Web: Common: fixed article height 2022-11-03 15:46:56 +03:00
Viktor Fomin
67d6ce5378 Common: Article: fix size 2022-11-03 17:40:16 +05:00
Viktor Fomin
e512015e70 Common: Article: fix img size 2022-11-03 16:44:54 +05:00
Viktor Fomin
28846ea77d Common: Article: fix position with smart banner 2022-11-02 17:13:23 +05:00
Viktor Fomin
20878155eb Common: Article: add theme for logo 2022-10-31 19:22:30 +05:00
Viktor Fomin
eded0a3a50 Merge branch 'develop' into feature/whitelabel 2022-10-28 16:05:38 +05:00
TimofeyBoyko
3baf50db59 Web:Common:Article: add theme support for vertical line 2022-10-28 12:54:06 +05:00
TimofeyBoyko
5bcbbb9b90 Web:Common:Article: add vertical line and fix styles 2022-10-28 12:42:43 +05:00
Viktor Fomin
1a25afd518 Common: Article: fix 2022-10-27 23:50:23 +05:00
Viktor Fomin
9033164e4a Common: Article: fix style 2022-10-25 14:30:44 +05:00
Viktor Fomin
3a61992044 Common: Article: use logos from whitelabel 2022-10-25 14:27:30 +05:00
TimofeyBoyko
7a1ddd3c20 Merge branch 'develop' into feature/portal-access-rights 2022-10-11 14:04:42 +05:00
ba6b92c7c2 Web: Added the ability to see alert in the article for administrators only. 2022-10-06 14:26:36 +03:00
TimofeyBoyko
5cfc7cf8d0 Merge branch 'develop' into feature/portal-access-rights 2022-10-06 13:41:14 +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
TimofeyBoyko
ae584739e8 Merge branch 'develop' into feature/portal-access-rights 2022-10-04 06:58:16 +03:00
955a9379de Web: Ipad: fixed Safari styles 2022-09-29 17:29:09 +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
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
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
389298dfd6 Web: Client: added theme to logo 2022-09-23 13:32:43 +03:00
TimofeyBoyko
7a2e3fea01 Merge branch 'develop' into feature/portal-access-rights 2022-09-22 16:24:57 +03:00
723a5709a6 Web: Common: fixed logo loader 2022-09-21 16:24:57 +03:00
31458b11e5
Merge branch 'develop' into bugfix/fixed-settings-loaders 2022-09-21 12:32:57 +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
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
TimofeyBoyko
853fa338ce Web:Client: move MainBar from section to global Layout and fix styles after this 2022-09-19 18:00:08 +03:00
7c06bc8e8e Web: Common: Article: fixed loader width 2022-09-19 17:42:34 +03:00