Commit Graph

587 Commits

Author SHA1 Message Date
f72d8af2b9 Merge branch 'develop' into feature/data-migration
# Conflicts:
#	packages/client/src/store/index.js
#	public/locales/en/Common.json
2024-03-04 14:30:41 +04:00
63540ab04f Merge branch 'develop' into bugfix/rc-2.5.0 2024-03-04 11:32:47 +04:00
138c73486b Client:Shared:Article: fix logo styles 2024-03-04 10:05:56 +03:00
55f206700e Web: Components: fixed table resizing when info-panel is open 2024-03-01 15:55:08 +03:00
107678b093 Shared: Article: Apps: support language in url 2024-03-01 14:02:27 +03:00
3938bd7859 Web: Components: Table: fixed crash 2024-03-01 13:16:19 +03:00
b4c3566e12 Shared: CampaignsBanner: add type 2024-03-01 02:39:57 +03:00
f960893622 Shared: CampaignsBanner: add rtl support 2024-03-01 02:35:55 +03:00
8261228759 Merge branch 'develop' into feature/editor-nextjs 2024-02-29 18:08:07 +03:00
321bf06fb4 Shared:Components:Share: fix combobox styles after merge 2024-02-29 18:03:31 +03:00
40a8db9d4c Merge branch 'develop' into feature/editor-nextjs 2024-02-29 18:00:55 +03:00
6152d587c6
Merge pull request #264 from ONLYOFFICE/feature/ads-banner
feature/ads-banner
2024-02-29 18:24:57 +04:00
95c2928f38 Merge branch 'develop' into feature/data-migration
# Conflicts:
#	packages/shared/components/table/sub-components/TableHeaderCell.tsx
2024-02-29 11:41:02 +04:00
f9b0599a07 Merge branch 'bugfix/rc-2.5.0' into develop 2024-02-29 11:04:48 +04:00
213a4e3ff4 Shared: CampaignsBanner: refactoring 2024-02-29 00:35:36 +03:00
daa1f5c95a Merge branch 'develop' into feature/ads-banner 2024-02-29 00:05:12 +03:00
33cbd3b0c4 Web: Files: TableHeader: fixed minWidth 2024-02-28 16:49:37 +03:00
0799361e02 Shared: CampaignsBanner: disable rtl 2024-02-27 19:22:45 +03:00
206f429c92 Web: MoreLoginModal: Fixed styles for sso. 2024-02-27 17:06:23 +03:00
da494e8aa3 Shared: CampaignsBanner: fix style 2024-02-27 13:23:45 +03:00
8aef7caf62 Merge branch 'develop' into feature/editor-nextjs 2024-02-27 12:53:21 +03:00
Vladimir Khvan
abb8ee3464 Merge branch 'develop' into feature/data-migration
Conflicts:
	packages/client/public/locales/en/People.json
	packages/client/public/locales/en/Settings.json
	packages/client/public/locales/ru/People.json
	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
	packages/client/src/pages/PortalSettings/utils/settingsTree.js
	packages/client/src/store/index.js
	packages/shared/enums/index.ts
	packages/shared/themes/base.ts
	packages/shared/themes/dark.ts
2024-02-27 14:51:49 +05:00
eebbb68734 Doceditor: fix iphone problems 2024-02-27 12:49:11 +03:00
eb127578b2 Merge branch 'feature/invite-page-redesign' of https://github.com/ONLYOFFICE/DocSpace-client into feature/invite-page-redesign
# Conflicts:
#	public/locales/en/Common.json
2024-02-27 11:47:46 +03:00
ca22a25f39 Web: Login: Fixed input focus. 2024-02-27 11:45:08 +03:00
31c6b2b1ad Web: Client: Fixed the button for changing user type in the group menu does not work 2024-02-27 13:27:36 +05:00
0fcda1213f Shared: CampaignsBanner: fix 2024-02-27 11:04:31 +03:00
95c2c6d455 Shared:Components:AppLoader: fix styles 2024-02-27 10:30:46 +03:00
6ff44125b7 Merge branch 'develop' into feature/ads-banner 2024-02-27 09:26:24 +03:00
8df0a29166 Web: Shared: Added translation. 2024-02-27 09:16:55 +03:00
bda5be229b Web: Fixed display of the number of providers. 2024-02-27 09:13:44 +03:00
15ddf95e3b Merge branch 'develop' into feature/invite-page-redesign 2024-02-26 20:49:56 +04:00
9e8f3caa16 Merge branch 'develop' into bugfix/rc-2.5.0 2024-02-26 20:48:53 +04:00
a21a415cb8 Shared: CampaignsBanner: fix style, add fit text 2024-02-26 18:34:31 +03:00
8ebc0fb6fa Web: Added scroll. 2024-02-26 17:11:33 +03:00
744b35297a Shared:Components:Toast: fix types 2024-02-26 15:13:21 +03:00
d577bce803 Shared:Components: fix default props 2024-02-26 14:40:29 +03:00
9701f3b85f Web: Removed warnings. 2024-02-26 14:02:01 +03:00
983d773f28 Web: Fixed styles. 2024-02-26 13:49:44 +03:00
dedfdc07b2 Web: Fixed styles. 2024-02-26 13:44:33 +03:00
5263983b56 Web: Shared: Components: ImageEditor: fixed blur in the preview when the screen is enlarged 2024-02-26 15:15:13 +05:00
11da227257 Fix translation issues 2024-02-26 12:06:12 +03:00
c9022a07c0 Web: Fixed styles. 2024-02-26 11:58:24 +03:00
b5f706a635 Web: Fixed provider titles. 2024-02-26 11:53:11 +03:00
cd7805b4ca Merge branch 'develop' into feature/editor-nextjs 2024-02-26 11:16:55 +03:00
ba4a8318a2 Shared:Components:Share: add wrapper with i18n 2024-02-26 11:02:41 +03:00
b4987dfbc3 Shared: ColorTheme: fix submenu color 2024-02-23 14:00:27 +03:00
112fdb1839 Merge branch 'develop' into feature/ads-banner
# Conflicts:
#	packages/shared/components/article/sub-components/SubmitToFormGalleryAlert.tsx
2024-02-22 20:05:26 +04:00
7b851cac74 Web: Files: added HexCode translation 2024-02-22 16:42:00 +03:00
b3d8fe0ffc
Merge pull request #273 from ONLYOFFICE/bugfix/safe-area
bugfix/safe-area
2024-02-22 17:31:27 +04:00