|
|
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 |
|
|
|
d3f7692bad
|
Merge branch 'develop' into refactoring/global-colors
|
2024-06-14 12:52:37 +05:00 |
|
|
|
f1f56677ae
|
Client: use colors from theme
|
2024-06-14 12:52:11 +05:00 |
|
|
|
01cf496eed
|
Shared: Themes: fix missing
|
2024-06-14 12:52:02 +05:00 |
|
|
|
116f8c5b0c
|
Shared: delete useless
|
2024-06-14 12:45:36 +05:00 |
|
|
|
bc6edf1aae
|
Client: use colors from theme
|
2024-06-14 12:43:33 +05:00 |
|
|
|
4188050574
|
Shared: Themes: fix missing
|
2024-06-14 12:43:12 +05: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 |
|
|
|
784d2d3fa3
|
Management: fix missing color
|
2024-06-13 18:10:28 +05:00 |
|
|
|
abce99d08f
|
Shared: Themes: fix
|
2024-06-13 17:44:18 +05:00 |
|
|
|
a25d362723
|
Management: use colors from theme
|
2024-06-13 17:44:09 +05: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 |
|
|
|
c4dfeca90d
|
Management: use colors from theme
|
2024-06-13 16:52:02 +05:00 |
|
|
|
9d194e5378
|
Shared: Themes: add themes for management
|
2024-06-13 16:51:32 +05:00 |
|
|
|
cd698b26d3
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop
|
2024-06-13 14:50:21 +03:00 |
|
|
|
a6c91aa37c
|
Login: delete useless
|
2024-06-13 16:40:42 +05:00 |
|
|
|
fef34264c7
|
Client:Dialogs: delete console log
|
2024-06-13 14:38:48 +03:00 |
|
|
|
d7019d9d51
|
Merge branch 'develop' into refactoring/global-colors
|
2024-06-13 16:37:01 +05:00 |
|
|
|
15b5c9b977
|
Shared: Themes: fix missing
|
2024-06-13 16:36:37 +05: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 |
|
|
|
9c1d2c8e2d
|
Shared:Components:SubMenu: delete Submenu
|
2024-06-13 16:40:00 +07:00 |
|
|
|
e71572d3e6
|
Client:Pages:PortalSettings: change submenu to tabs
|
2024-06-13 16:38:33 +07:00 |
|
|
|
7601906e68
|
Shared:Components:TabsContainer: delete Tabs Container
|
2024-06-13 16:23:12 +07:00 |
|
|
|
e31496aac2
|
Client:Pages:Profile: add a check for data in tabs
|
2024-06-13 16:18:44 +07:00 |
|
