|
|
f1f38ca671
|
Merge branch 'develop' into feature/sr-cyrl
|
2024-06-17 14:59:01 +04:00 |
|
|
|
834513ecd3
|
Client: Added common flag for "sr-Cyrl-RS"
|
2024-06-17 14:55:55 +04:00 |
|
|
|
8024a08247
|
Merge branch 'develop' into feature/new-tabs
|
2024-06-17 17:46:07 +07:00 |
|
|
|
ba9e10b86a
|
Merge pull request #493 from ONLYOFFICE/bugfix/filter
Bugfix/filter
|
2024-06-17 14:31:58 +04:00 |
|
|
|
5d8b2a3fba
|
Shared: Fixed colors for selector panel.
|
2024-06-17 13:08:17 +03:00 |
|
|
|
db43b5d938
|
Merge branch 'develop' into feature/new-tabs
|
2024-06-17 17:00:42 +07:00 |
|
|
|
b8c53f769c
|
Shared:Components:Tabs: fix padding
|
2024-06-17 16:59:43 +07:00 |
|
|
|
d41f1816f3
|
Shared:Components:Tabs: change import types
|
2024-06-17 16:58:31 +07:00 |
|
|
|
34703214ad
|
Web: Components: Table: removed padding
|
2024-06-17 11:37:58 +03:00 |
|
|
|
04b0e82348
|
Merge branch 'develop' into feature/new-tabs
|
2024-06-17 14:11:21 +07:00 |
|
|
|
0da0949215
|
Shared:Components:Tabs: add custom scrollbar
|
2024-06-17 14:02:18 +07:00 |
|
|
|
b5bd0b21fa
|
Replacing two dots in a sentence, deleted useless code.
|
2024-06-14 14:30:47 +03:00 |
|
|
|
a7d44f61a6
|
Shared:Components:Tabs: add user-select to styles
|
2024-06-14 18:21:47 +07:00 |
|
|
|
e0705efdbd
|
Fixed payment date.
|
2024-06-14 13:57:45 +03:00 |
|
|
|
3e07e24de1
|
Shared:Components:Selector: fix props for the tabs component
|
2024-06-14 17:40:18 +07:00 |
|
|
|
0d1f71e14c
|
Renaming.
|
2024-06-14 13:25:48 +03:00 |
|
|
|
f60ef3547d
|
Renaming.
|
2024-06-14 13:19:28 +03:00 |
|
|
|
e247ba3db3
|
Renaming.
|
2024-06-14 13:07:19 +03:00 |
|
|
|
45b363a770
|
Changed import.
|
2024-06-14 12:41:49 +03:00 |
|
|
|
e02d05c43f
|
Merge branch 'develop' into feature/values-renaming
|
2024-06-14 12:19:34 +04: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 |
|
|
|
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 |
|
|
|
600d076f5c
|
Merge branch 'develop' into feature/hcaptcha
|
2024-06-14 09:52:15 +03:00 |
|
|
|
19de426c9c
|
Shared:Components:All: change import tabs types
|
2024-06-13 22:05:12 +07:00 |
|
|
|
4a77b0f679
|
Shared:Components:Tabs: change prop ThemeTabs and imports
|
2024-06-13 22:02:13 +07: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 |
|
|
|
e6bd7fbc63
|
Deleted useless settings parameter.
|
2024-06-13 15:04:49 +03:00 |
|
|
|
ac39456e8c
|
Shared:Components:ImageEditor: add support maxImageSize
|
2024-06-13 14:34:00 +03:00 |
|
|
|
8af20b8e41
|
Shared:API:Settings: add maxUploadImageSize
|
2024-06-13 14:33: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 |
|
|
|
9c1d2c8e2d
|
Shared:Components:SubMenu: delete Submenu
|
2024-06-13 16:40:00 +07:00 |
|
|
|
7601906e68
|
Shared:Components:TabsContainer: delete Tabs Container
|
2024-06-13 16:23:12 +07:00 |
|
|
|
3fb8f58206
|
Merge branch 'develop' into feature/values-renaming
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# 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 11:28:33 +03:00 |
|
|
|
baec28ed6e
|
Shared:Components:Tabs: remove as from type declaration
|
2024-06-13 15:16:05 +07:00 |
|
|
|
83aa877b74
|
Merge branch 'develop' into feature/hcaptcha
|
2024-06-13 10:40:17 +03:00 |
|
|
|
a78086c680
|
Shared: add captchaKey and captchaType for login
|
2024-06-13 10:38:15 +03:00 |
|
|
|
f9dd563cd1
|
Merge remote-tracking branch 'origin/develop' into feature/new-tabs
|
2024-06-13 13:48:45 +07:00 |
|
|
|
cb0fd44eb3
|
Merge branch 'develop' into bugfix/standalone
|
2024-06-11 20:32:48 +04:00 |
|
|
|
d1a1c9b477
|
Merge branch 'develop' into bugfix/standalone
# Conflicts:
# packages/client/public/locales/ar-SA/PaymentsEnterprise.json
# packages/client/public/locales/az/PaymentsEnterprise.json
# packages/client/public/locales/bg/PaymentsEnterprise.json
# packages/client/public/locales/cs/PaymentsEnterprise.json
# packages/client/public/locales/de/PaymentsEnterprise.json
# packages/client/public/locales/el-GR/PaymentsEnterprise.json
# packages/client/public/locales/en/PaymentsEnterprise.json
# packages/client/public/locales/es/PaymentsEnterprise.json
# packages/client/public/locales/fi/PaymentsEnterprise.json
# packages/client/public/locales/fr/PaymentsEnterprise.json
# packages/client/public/locales/hy-AM/PaymentsEnterprise.json
# packages/client/public/locales/it/PaymentsEnterprise.json
# packages/client/public/locales/ja-JP/PaymentsEnterprise.json
# packages/client/public/locales/ko-KR/PaymentsEnterprise.json
# packages/client/public/locales/lo-LA/PaymentsEnterprise.json
# packages/client/public/locales/lv/PaymentsEnterprise.json
# packages/client/public/locales/nl/PaymentsEnterprise.json
# packages/client/public/locales/pl/PaymentsEnterprise.json
# packages/client/public/locales/pt-BR/PaymentsEnterprise.json
# packages/client/public/locales/pt/PaymentsEnterprise.json
# packages/client/public/locales/ro/PaymentsEnterprise.json
# packages/client/public/locales/ru/PaymentsEnterprise.json
# packages/client/public/locales/si/PaymentsEnterprise.json
# packages/client/public/locales/sk/PaymentsEnterprise.json
# packages/client/public/locales/sl/PaymentsEnterprise.json
# packages/client/public/locales/sr-Latn-RS/PaymentsEnterprise.json
# packages/client/public/locales/tr/PaymentsEnterprise.json
# packages/client/public/locales/uk-UA/PaymentsEnterprise.json
# packages/client/public/locales/vi/PaymentsEnterprise.json
|
2024-06-11 18:27:24 +03:00 |
|
Akmal Isomadinov
|
fb940c9add
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/EmptyView.json
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
|
2024-06-11 20:15:15 +05:00 |
|
|
|
7ff7a35520
|
Merge branch 'develop' into feature/values-renaming
# Conflicts:
# packages/client/public/locales/ar-SA/JavascriptSdk.json
# packages/client/public/locales/ar-SA/Settings.json
# packages/client/public/locales/az/JavascriptSdk.json
# packages/client/public/locales/az/Settings.json
# packages/client/public/locales/az/Translations.json
# packages/client/public/locales/bg/JavascriptSdk.json
# packages/client/public/locales/bg/Settings.json
# packages/client/public/locales/bg/Translations.json
# packages/client/public/locales/cs/JavascriptSdk.json
# packages/client/public/locales/cs/Settings.json
# packages/client/public/locales/cs/Translations.json
# packages/client/public/locales/de/JavascriptSdk.json
# packages/client/public/locales/de/Settings.json
# packages/client/public/locales/de/Translations.json
# packages/client/public/locales/el-GR/JavascriptSdk.json
# packages/client/public/locales/el-GR/Settings.json
# packages/client/public/locales/el-GR/Translations.json
# packages/client/public/locales/en/JavascriptSdk.json
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/en/Translations.json
# packages/client/public/locales/es/JavascriptSdk.json
# packages/client/public/locales/es/Settings.json
# packages/client/public/locales/es/Translations.json
# packages/client/public/locales/fi/JavascriptSdk.json
# packages/client/public/locales/fi/Settings.json
# packages/client/public/locales/fi/Translations.json
# packages/client/public/locales/fr/JavascriptSdk.json
# packages/client/public/locales/fr/Settings.json
# packages/client/public/locales/fr/Translations.json
# packages/client/public/locales/hy-AM/Settings.json
# packages/client/public/locales/hy-AM/Translations.json
# packages/client/public/locales/it/JavascriptSdk.json
# packages/client/public/locales/it/Settings.json
# packages/client/public/locales/it/Translations.json
# packages/client/public/locales/ja-JP/JavascriptSdk.json
# packages/client/public/locales/ja-JP/Settings.json
# packages/client/public/locales/ja-JP/Translations.json
# packages/client/public/locales/ko-KR/JavascriptSdk.json
# packages/client/public/locales/ko-KR/Settings.json
# packages/client/public/locales/ko-KR/Translations.json
# packages/client/public/locales/lo-LA/Settings.json
# packages/client/public/locales/lo-LA/Translations.json
# packages/client/public/locales/lv/JavascriptSdk.json
# packages/client/public/locales/lv/Settings.json
# packages/client/public/locales/lv/Translations.json
# packages/client/public/locales/nl/JavascriptSdk.json
# packages/client/public/locales/nl/Settings.json
# packages/client/public/locales/nl/Translations.json
# packages/client/public/locales/pl/JavascriptSdk.json
# packages/client/public/locales/pl/Settings.json
# packages/client/public/locales/pl/Translations.json
# packages/client/public/locales/pt-BR/JavascriptSdk.json
# packages/client/public/locales/pt-BR/Settings.json
# packages/client/public/locales/pt-BR/Translations.json
# packages/client/public/locales/pt/JavascriptSdk.json
# packages/client/public/locales/pt/Settings.json
# packages/client/public/locales/pt/Translations.json
# packages/client/public/locales/ro/JavascriptSdk.json
# packages/client/public/locales/ro/Settings.json
# packages/client/public/locales/ro/Translations.json
# packages/client/public/locales/ru/JavascriptSdk.json
# packages/client/public/locales/ru/Settings.json
# packages/client/public/locales/ru/Translations.json
# packages/client/public/locales/si/JavascriptSdk.json
# packages/client/public/locales/si/Settings.json
# packages/client/public/locales/si/Translations.json
# packages/client/public/locales/sk/JavascriptSdk.json
# packages/client/public/locales/sk/Settings.json
# packages/client/public/locales/sk/Translations.json
# packages/client/public/locales/sl/JavascriptSdk.json
# packages/client/public/locales/sl/Settings.json
# packages/client/public/locales/sl/Translations.json
# packages/client/public/locales/sr-Latn-RS/JavascriptSdk.json
# packages/client/public/locales/sr-Latn-RS/Settings.json
# packages/client/public/locales/sr-Latn-RS/Translations.json
# packages/client/public/locales/tr/JavascriptSdk.json
# packages/client/public/locales/tr/Settings.json
# packages/client/public/locales/tr/Translations.json
# packages/client/public/locales/uk-UA/JavascriptSdk.json
# packages/client/public/locales/uk-UA/Settings.json
# packages/client/public/locales/uk-UA/Translations.json
# packages/client/public/locales/vi/JavascriptSdk.json
# packages/client/public/locales/vi/Settings.json
# packages/client/public/locales/vi/Translations.json
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/FilesSelector/utils.ts
# packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
# packages/client/src/components/dialogs/DeletePortalDialog/index.js
# packages/client/src/components/panels/InvitePanel/utils/index.js
# packages/client/src/pages/Confirm/sub-components/changePhone.js
# packages/client/src/pages/Confirm/sub-components/continuePortal.js
# packages/client/src/pages/Confirm/sub-components/deactivatePortal.js
# packages/client/src/pages/Confirm/sub-components/removePortal.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/RowView/userContent.js
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
# packages/client/src/pages/Home/Section/AccountsBody/People/RowView/userContent.js
# packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/index.js
# packages/client/src/pages/PortalSettings/categories/delete-data/index.js
# packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/DocSpace.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Manager.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/sub-components/MainElementParameter.js
# packages/client/src/pages/PortalSettings/categories/payments/SaaS/PaymentContainer.js
# packages/client/src/store/AccountsContextOptionsStore.js
# packages/client/src/store/ContextOptionsStore.js
# packages/client/src/store/PeopleStore.js
# packages/management/public/locales/ar-SA/Management.json
# packages/management/public/locales/az/Management.json
# packages/management/public/locales/bg/Management.json
# packages/management/public/locales/cs/Management.json
# packages/management/public/locales/de/Management.json
# packages/management/public/locales/el-GR/Management.json
# packages/management/public/locales/en/Management.json
# packages/management/public/locales/es/Management.json
# packages/management/public/locales/fi/Management.json
# packages/management/public/locales/fr/Management.json
# packages/management/public/locales/it/Management.json
# packages/management/public/locales/ja-JP/Management.json
# packages/management/public/locales/ko-KR/Management.json
# packages/management/public/locales/lv/Management.json
# packages/management/public/locales/nl/Management.json
# packages/management/public/locales/pl/Management.json
# packages/management/public/locales/pt-BR/Management.json
# packages/management/public/locales/pt/Management.json
# packages/management/public/locales/ro/Management.json
# packages/management/public/locales/ru/Management.json
# packages/management/public/locales/sk/Management.json
# packages/management/public/locales/sl/Management.json
# packages/management/public/locales/sr-Latn-RS/Management.json
# packages/management/public/locales/tr/Management.json
# packages/management/public/locales/uk-UA/Management.json
# packages/management/public/locales/vi/Management.json
# packages/management/src/categories/spaces/sub-components/ConfigurationSection.tsx
# packages/management/src/categories/spaces/sub-components/dialogs/CreatePortalDialog/index.tsx
# packages/shared/utils/common.ts
# 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
|
2024-06-11 17:15:32 +03:00 |
|
|
|
00b54b88e3
|
Merge pull request #471 from ONLYOFFICE/bugfix/fixed-multiple-windows-table
Web: Components: fixed table for multiple windows
|
2024-06-11 14:23:10 +03:00 |
|
Akmal Isomadinov
|
70e0561351
|
Shared:Selectors:Files Fixed socket
|
2024-06-11 16:22:08 +05:00 |
|
