Commit Graph

46604 Commits

Author SHA1 Message Date
0d1f71e14c Renaming. 2024-06-14 13:25:48 +03:00
9c0fa8b726 Fixed user types name. 2024-06-14 13:20:13 +03:00
f60ef3547d Renaming. 2024-06-14 13:19:28 +03:00
e247ba3db3 Renaming. 2024-06-14 13:07:19 +03:00
ca2c2a29bd Deleted useless code. 2024-06-14 12:58:59 +03:00
e710bc121a
Merge pull request #485 from ONLYOFFICE/bugfix/form-room
Client:Components:Badges Removed icon start filling
2024-06-14 13:57:42 +04:00
Akmal Isomadinov
c7335f6d59 Client:Components:Badges Removed icon start filling 2024-06-14 14:55:32 +05:00
45b363a770 Changed import. 2024-06-14 12:41:49 +03:00
1fcd54c654 Fixed translation. 2024-06-14 12:35:42 +03:00
e4bdfaccd0 Merge branch 'develop' into bugfix/68353 2024-06-14 11:23:21 +03:00
e02d05c43f Merge branch 'develop' into feature/values-renaming 2024-06-14 12:19:34 +04:00
03b5d87b98 Client:Pages:PotalSettins: change useEffect dependency 2024-06-14 15:15:27 +07:00
6ef8481e88
Merge pull request #479 from ONLYOFFICE/feature/hcaptcha
Feature/hcaptcha
2024-06-14 12:13:39 +04:00
a7d26ad8f7
Merge pull request #481 from ONLYOFFICE/bugfix/bug-68497
bugfix/bug-68497
2024-06-14 12:09:47 +04:00
eeae89e79f
Merge pull request #484 from ONLYOFFICE/bugfix/bug-68590
Fixed bug 68590 Changed the cursor view
2024-06-14 12:07:18 +04:00
9f09257d93 Merge branch 'develop' into feature/values-renaming 2024-06-14 12:05:26 +04:00
129566a1a4 Translation: Fix EnDublicatesByContentTest issue 2024-06-14 12:05:03 +04:00
Akmal Isomadinov
ac86f1e630 Fixed bug 68590 Changed the cursor view 2024-06-14 13:03:42 +05:00
6101c7ad60 Fixed after merge. 2024-06-14 11:03:07 +03:00
c750dd62e9 Merge branch 'develop' into feature/new-tabs 2024-06-14 14:58:21 +07:00
5593c4b655 Merge branch 'develop' into feature/values-renaming 2024-06-14 11:27:02 +04:00
b0c9f112ff
Merge pull request #473 from ONLYOFFICE/bugfix/68441
Bugfix/68441
2024-06-14 11:24:15 +04:00
52163b2523
Merge pull request #470 from ONLYOFFICE/bugfix/sort-scroll-reset
Client: Fix page staying scrolled after changing sort or filter
2024-06-14 11:20:45 +04:00
2f453a9fe0 Merge branch 'develop' into bugfix/sort-scroll-reset 2024-06-14 11:14:15 +04:00
600d076f5c Merge branch 'develop' into feature/hcaptcha 2024-06-14 09:52:15 +03:00
861a462ff9 LDAP: Fix showReminder button disable 2024-06-13 19:24:47 +04:00
a72616801b gs
# Conflicts:
#	i18next/client.babel
#	packages/client/public/locales/sr-Latn-RS/SMTPSettings.json
#	packages/login/public/locales/en/Login.json
#	public/locales/ar-SA/Common.json
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el-GR/Common.json
#	public/locales/en/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/hy-AM/Common.json
#	public/locales/it/Common.json
#	public/locales/ja-JP/Common.json
#	public/locales/ko-KR/Common.json
#	public/locales/lo-LA/Common.json
#	public/locales/lv/Common.json
#	public/locales/nl/Common.json
#	public/locales/pl/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/si/Common.json
#	public/locales/sk/Common.json
#	public/locales/sl/Common.json
#	public/locales/sr-Latn-RS/Common.json
#	public/locales/tr/Common.json
#	public/locales/uk-UA/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
2024-06-13 19:24:05 +04:00
19de426c9c Shared:Components:All: change import tabs types 2024-06-13 22:05:12 +07:00
f02ec28d30 Client:Pages:PortalSettings: change import tabs types 2024-06-13 22:04:19 +07:00
4a77b0f679 Shared:Components:Tabs: change prop ThemeTabs and imports 2024-06-13 22:02:13 +07:00
76909db51f Fixed Bug 68353 - The document does not reload after its assembly when the network connection is interrupted 2024-06-13 17:44:24 +03:00
8328e6c092 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop 2024-06-13 17:20:36 +03:00
6a27c760eb Shared:Components:Tabs: change imports 2024-06-13 20:42:06 +07:00
3b2d9d79cd Shared:Components:Selector: change types for tabs 2024-06-13 20:41:21 +07:00
238441700d Shared:Components:Tabs: add changes to tests 2024-06-13 20:35:21 +07:00
f98433c0bd
Merge pull request #482 from ONLYOFFICE/feature/max-image-upload-size
Feature/max image upload size
2024-06-13 17:23:44 +04:00
c948f377f1 Accounts: change pending status and translation 2024-06-13 16:22:52 +04:00
cc43e0efdf Renaming. 2024-06-13 15:11:05 +03:00
e6bd7fbc63 Deleted useless settings parameter. 2024-06-13 15:04:49 +03:00
cd698b26d3 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop 2024-06-13 14:50:21 +03:00
fef34264c7 Client:Dialogs: delete console log 2024-06-13 14:38:48 +03:00
c2b4fcb399 Client:Dialogs: pass maxImageSize to ImageEditor 2024-06-13 14:34:14 +03:00
ac39456e8c Shared:Components:ImageEditor: add support maxImageSize 2024-06-13 14:34:00 +03:00
cb882cf141 Added use of constants. 2024-06-13 14:33:36 +03:00
8af20b8e41 Shared:API:Settings: add maxUploadImageSize 2024-06-13 14:33:27 +03:00
778b71e4a4 Restored value name. 2024-06-13 14:12:27 +03:00
850c667145 Renaming. 2024-06-13 14:10:28 +03:00
Akmal Isomadinov
8b027f5709 Client:Components Fixed bug 68497 added tooltip 2024-06-13 15:32:58 +05:00
0730775b36 Merge branch 'feature/sr-cyrl' into develop
# Conflicts:
#	packages/client/public/locales/en/PrivacyPage.json
#	packages/client/public/locales/sr-Latn-RS/ChangeUserStatusDialog.json
#	packages/client/public/locales/sr-Latn-RS/CreateEditRoomDialog.json
#	packages/client/public/locales/sr-Latn-RS/Files.json
#	packages/client/public/locales/sr-Latn-RS/JavascriptSdk.json
#	packages/client/public/locales/sr-Latn-RS/Notifications.json
#	packages/client/public/locales/sr-Latn-RS/PaymentsEnterprise.json
#	packages/client/public/locales/sr-Latn-RS/PrivacyPage.json
#	packages/client/public/locales/sr-Latn-RS/Settings.json
#	packages/client/public/locales/sr-Latn-RS/SingleSignOn.json
#	packages/client/public/locales/sr-Latn-RS/Webhooks.json
#	public/locales/sr-Latn-RS/Common.json
2024-06-13 14:23:08 +04:00
986c731d84 Merge branch 'develop' into feature/new-tabs 2024-06-13 16:53:43 +07:00