|
|
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 |
|
|
|
f95ec34dc1
|
Client:Pages:Нome: add a check for data in tabs
|
2024-06-13 16:18:25 +07:00 |
|
|
|
bcf23b865e
|
Client:Pages:PortalSettigs: add a check for data in tabs
|
2024-06-13 16:17:33 +07:00 |
|
|
|
c88c4b84bf
|
Fixed after merge.
|
2024-06-13 12:11:08 +03:00 |
|
|
|
5a8a47f3cf
|
Merge pull request #477 from ONLYOFFICE/bugfix/bug-67799
bugfix/bug-67799
|
2024-06-13 12:29:09 +04:00 |
|
|
|
5e31dc4785
|
Login: delete console log
|
2024-06-13 11:29:03 +03: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 |
|
|
|
97922ca6c6
|
Login: fix login logo theme
|
2024-06-13 10:59:36 +03:00 |
|
|
|
83aa877b74
|
Merge branch 'develop' into feature/hcaptcha
|
2024-06-13 10:40:17 +03:00 |
|
|
|
ffeac3a8b4
|
Login:LoginForm: add hCaptcha and captcha components
|
2024-06-13 10:38:35 +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 |
|
Akmal Isomadinov
|
280854956d
|
Client:Components:QuickButtons Fixed bug 67799 fix lock icon on tablet device
|
2024-06-12 15:22:31 +05:00 |
|
|
|
de942bdbac
|
Merge pull request #464 from ONLYOFFICE/bugfix/standalone
bugfix/standalone
|
2024-06-11 20:55:29 +04:00 |
|
|
|
cb0fd44eb3
|
Merge branch 'develop' into bugfix/standalone
|
2024-06-11 20:32:48 +04:00 |
|
|
|
eb6aee9b0b
|
Merge pull request #455 from ONLYOFFICE/feature/form-room
Feature/form room
|
2024-06-11 20:21:55 +04:00 |
|
|
|
3a3aa8341c
|
Translations: Fix NotFoundKeysTest
|
2024-06-11 20:17:08 +04:00 |
|
|
|
05dec0ebdf
|
Translations: Fix UselessTranslationKeysTest issues
|
2024-06-11 20:09:16 +04:00 |
|
|
|
e431f49ccf
|
Deleted useless code.
|
2024-06-11 18:38:38 +03:00 |
|
|
|
e1013eba48
|
Fixed translation.
|
2024-06-11 18:36:51 +03:00 |
|
|
|
c8a04cce7b
|
Added new translation.
|
2024-06-11 18:34:47 +03: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 |
|
Akmal Isomadinov
|
ba60b27e73
|
Client: Removed OFORM
|
2024-06-11 20:01:57 +05:00 |
|
Akmal Isomadinov
|
e3f6e469bd
|
Client: Removed DOCXF
|
2024-06-11 19:58:26 +05:00 |
|
Akmal Isomadinov
|
42071817c0
|
Client:HOCS:WithHotkeys Fixed hotkeys in form room
|
2024-06-11 19:50:34 +05:00 |
|
|
|
bfddeae2e2
|
Fixed after merge.
|
2024-06-11 17:17:09 +03: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 |
|
Akmal Isomadinov
|
6c97b81d5d
|
Doceditor:Hooks:UseStartFillingSelectDialog Fixed open new tab on FF
|
2024-06-11 19:12:37 +05:00 |
|
|
|
3a263c8ce8
|
LDAP: Move ProgressBar to ButtonContainer on mobile
|
2024-06-11 17:19:17 +04:00 |
|
|
|
caacc6e563
|
Merge pull request #476 from ONLYOFFICE/bugfix/fixed-filtering-after-user-deleting
Fix Bug 68439 - Accounts. Fixed sorting of the list after deleting an…
|
2024-06-11 14:51:07 +03:00 |
|
|
|
6b5cb2bdd0
|
Fix Bug 68439 - Accounts. Fixed sorting of the list after deleting an account
|
2024-06-11 14:27:23 +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 |
|
|
|
9c4d539508
|
Merge pull request #474 from ONLYOFFICE/bugfix/renaming-constant
Bugfix/renaming constant
|
2024-06-11 15:21:08 +04:00 |
|
|
|
ea18790cbc
|
Replacing a value with a constant.
|
2024-06-11 14:08:50 +03:00 |
|
|
|
06660287c0
|
Merge pull request #472 from ONLYOFFICE/bugfix/fixed-owner-role-label
Fix Bug 68474 - Room: Owner: fixed role label
|
2024-06-11 14:05:47 +03:00 |
|
|
|
6531435d84
|
Merge branch 'develop' into feature/values-renaming
|
2024-06-11 13:53:39 +03:00 |
|
|
|
0fa5401144
|
Shared:Components:Tabs: change imports
|
2024-06-11 17:38:53 +07:00 |
|
|
|
0acab4546c
|
Shared:Components:Tabs: change data in storybook
|
2024-06-11 17:38:05 +07:00 |
|
|
|
07050701a8
|
Fixed translations.
|
2024-06-11 13:33:32 +03:00 |
|
|
|
55c9942146
|
Renaming portalName value.
|
2024-06-11 13:28:32 +03:00 |
|
|
|
42d9465ff1
|
Accounts: Added tooltips for SSO (Profile/InfoPanel)
|
2024-06-11 14:24:44 +04:00 |
|
|
|
01a00d8dc0
|
Accounts: Added tooltips for LDAP (Profile/InfoPanel)
|
2024-06-11 14:24:34 +04:00 |
|
