Commit Graph

98 Commits

Author SHA1 Message Date
8c300ade62 Web: Article: Changed translation. 2022-12-29 10:37:02 +03:00
e8141c6f22 Web: Changed load Docspace config for clients 2022-12-20 19:51:49 +03:00
426a11d080 Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
Timofey Boyko
8abbb0f250 Web:Common:Article: fix show text button color 2022-12-08 16:24:34 +03:00
Viktor Fomin
15ff7aa19d Merge branch 'develop' into feature/fix-whitelable 2022-12-06 16:50:55 +03:00
8e0bc0a732 Merge branch 'develop' into release/rc-v1.2.0 2022-12-02 19:56:43 +03:00
Viktor Fomin
f703d1b47e Common: Article: open profile by click username 2022-12-02 17:22:29 +03:00
Viktor Fomin
f6d5d22987 Common: Article: add background 2022-12-02 17:20:08 +03:00
Elyor Djalilov
7e06c67e00 Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
#	packages/client/src/pages/Home/InfoPanel/Header/index.js
2022-11-30 23:07:13 +05:00
Viktor Fomin
366d92abb2 Merge branch 'develop' into feature/fix-whitelable 2022-11-28 12:09:11 +03:00
Elyor Djalilov
b8348af578 Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
#	packages/client/public/locales/en/DeleteDialog.json
#	packages/client/public/locales/en/Files.json
#	packages/client/public/locales/en/InfoPanel.json
#	packages/client/public/locales/en/InviteDialog.json
#	packages/client/public/locales/en/Payments.json
#	packages/client/public/locales/en/Profile.json
#	packages/client/public/locales/en/Settings.json
#	packages/client/public/locales/en/Translations.json
#	packages/client/public/locales/ru/Files.json
#	packages/client/public/locales/ru/InfoPanel.json
#	packages/client/public/locales/ru/Payments.json
#	packages/client/src/components/GlobalEvents/RenameEvent.js
#	packages/client/src/pages/Home/Section/Filter/index.js
2022-11-25 16:27:23 +05:00
f929e42dcb Merge branch 'develop' into bugfix/fix-article-iphone 2022-11-25 14:04:37 +03:00
Viktor Fomin
e48ffdd62f Common: Article: delete console 2022-11-24 12:16:23 +05:00
Viktor Fomin
f52ec4e467 Common: Article: fix 2022-11-24 05:39:13 +05:00
Viktor Fomin
1fb1228dbd Merge branch 'develop' into feature/fix-whitelable 2022-11-24 02:33:13 +05:00
d3d91ba54e Merge branch 'develop' into feature/custom-theme 2022-11-23 19:57:15 +03:00
Viktor Fomin
fd181baae3 Merge branch 'develop' into feature/fix-whitelable 2022-11-23 15:01:42 +05:00
Viktor Fomin
5c997947f8 Common: Article: fix close 2022-11-23 14:45:22 +05:00
Viktor Fomin
004aceda28 Common: Article: fix logo 2022-11-23 06:19:01 +05:00
TimofeyBoyko
91835c2b95 Web:Common:Article: add render with portal for mobile devices 2022-11-22 12:16:53 +03:00
Viktor Fomin
50c55f0e29 Common: fix logo 2022-11-22 13:06:07 +05:00
999e892b7e Merge branch 'develop' into feature/custom-theme 2022-11-17 17:30:46 +03:00
2636ec0705 Web:Common:Fix accent color theme. 2022-11-14 15:51:53 +03: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
073aa9943f Fix WrongTranslationVariablesTest issues + added missing files and key sorting 2022-10-25 14:52:15 +03: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