|
|
165f57ea88
|
Merge branch 'develop' into refactoring/global-colors
|
2024-07-24 15:04:46 +03:00 |
|
|
|
116702d286
|
Merge branch 'release/v2.6.0' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/ImportStep/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/UsersTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/ImportStep/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTypeTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/ImportStep.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/Providers.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/RowView/UsersRowContent.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/TableView/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersTypeStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/sub-components/UsersInfoBlock.tsx
# packages/login/src/components/Invalid.tsx
|
2024-07-22 20:23:04 +04:00 |
|
|
|
ea46b0496c
|
Add translations for ZH
|
2024-07-19 17:15:22 +03:00 |
|
|
|
292d420caa
|
Rebranding: move PRODUCT_NAME to Common.json
|
2024-07-18 18:48:09 +04:00 |
|
|
|
97d7847fd3
|
Fix Bug 69244
Custom logo doesn't fit on mobile
|
2024-07-17 12:21:20 +03:00 |
|
|
|
f1e6f79704
|
Merge branch 'release/v2.6.0' into develop
# Conflicts:
# packages/login/src/components/LoginForm/index.tsx
|
2024-07-12 11:11:05 +04:00 |
|
|
|
0266d5cb74
|
Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-11 17:21:53 +03:00 |
|
|
|
6ca6763215
|
Fixed Bug 69125 - Mobile. The Recover access button is hidden on the login page when a captcha appears
|
2024-07-11 17:21:44 +03:00 |
|
|
|
554826a185
|
Login: LoginForm: Fixed checkConfirmLink for login inside confirm flow
|
2024-07-11 16:16:05 +03:00 |
|
|
|
99e265ebee
|
Merge branch 'release/v2.6.0' into develop
# Conflicts:
# packages/client/src/components/PrivateRouteWrapper/index.tsx
# packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
# packages/login/src/app/layout.tsx
# packages/login/src/components/LoginForm/index.tsx
# packages/login/src/middleware.ts
# packages/login/src/utils/index.ts
# packages/shared/components/table/TableHeader.tsx
# packages/shared/routes/Route.private.tsx
|
2024-07-11 12:27:31 +04:00 |
|
|
|
6142d26b61
|
Login: fix health check for localhost
|
2024-07-10 11:20:05 +03:00 |
|
|
|
66c6062c76
|
Login: fix autocomplete
|
2024-07-08 13:08:07 +03:00 |
|
|
|
d0d633bedf
|
Merge pull request #537 from ONLYOFFICE/feature/invite-link
Feature/invite link
|
2024-07-03 17:23:01 +03:00 |
|
|
|
da6254529b
|
Added title for invalid link page.
|
2024-07-03 16:11:46 +03:00 |
|
|
|
12349ec12a
|
Merge branch 'release/v2.6.0' into feature/invite-link
|
2024-07-03 14:40:53 +03:00 |
|
|
|
38c6f6c0fa
|
Login: Utils: Added getConfirmDataFromInvitation
|
2024-07-03 14:39:52 +03:00 |
|
|
|
c25f65d470
|
Login: Form: Added confirm check after redirect to login from confirm page
|
2024-07-03 14:39:06 +03:00 |
|
|
|
806f81d2f9
|
Fix Bug 68949
Before opening Wizard, Login page opens
|
2024-07-02 17:44:35 +03:00 |
|
|
|
afe0985fee
|
Login:Actions: fix SSO url
|
2024-07-02 14:26:43 +03:00 |
|
|
|
38fdec284b
|
Fix Bug 68950
Prevent duplicate confirm email toast
|
2024-07-02 13:16:49 +03:00 |
|
|
|
10300cefcf
|
Merge branch 'develop' into refactoring/global-colors
|
2024-06-28 14:04:00 +03:00 |
|
|
|
8f4ddba367
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-28 13:28:10 +03:00 |
|
|
|
572e16a7f2
|
Login:OAuth: add translations and default logo for tenant list
|
2024-06-28 13:12:11 +03:00 |
|
|
|
dea872e497
|
Login:OAuth: add handle errors
|
2024-06-28 13:01:13 +03:00 |
|
|
|
11b5de43c8
|
Login: fix consent for public client
|
2024-06-27 18:21:13 +03:00 |
|
|
|
622c05a673
|
Login: Components: Fixed flags color.
|
2024-06-27 15:58:31 +03:00 |
|
|
|
def151fe66
|
Client:OAuth: refactoring
|
2024-06-27 13:31:49 +03:00 |
|
|
|
ce1bb3ae6b
|
Bump version to v2.6.0
|
2024-06-27 08:18:39 +03:00 |
|
|
|
b2f47a0125
|
Login:LoginForm: restore auth for 1 portal for public client
|
2024-06-26 15:47:21 +03:00 |
|
|
|
125590044e
|
Login:Consent: add login method
|
2024-06-26 15:42:20 +03:00 |
|
|
|
d7914ad024
|
Login: add tenant-list route
|
2024-06-26 15:19:00 +03:00 |
|
|
|
0fb2b762c0
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-24 14:01:36 +03:00 |
|
|
|
3899336f06
|
Merge branch 'develop' into refactoring/global-colors
|
2024-06-20 16:29:15 +03:00 |
|
|
|
8283ed16e6
|
Merge branch 'develop' into feature/sr-cyrl
|
2024-06-20 12:46:42 +04:00 |
|
|
|
ec907c512d
|
Login: add check for public oauth client
|
2024-06-19 18:14:43 +03:00 |
|
|
|
6145817cb8
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-18 13:12:53 +03:00 |
|
|
|
a74bcac2f1
|
edited variables sr-cyrl
|
2024-06-18 11:28:09 +03:00 |
|
|
|
529a78e765
|
Merge branch 'develop' into refactoring/global-colors
|
2024-06-18 10:16:14 +03:00 |
|
|
|
a639635c98
|
Merge branch 'develop' into feature/ldap-settings
# Conflicts:
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
# packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
# packages/login/src/components/LoginForm/index.tsx
# packages/shared/store/SettingsStore.ts
# public/locales/en/Common.json
|
2024-06-17 15:17:07 +04:00 |
|
|
|
2a57c57e07
|
Merge branch 'develop' into refactoring/global-colors
|
2024-06-14 16:53:06 +05:00 |
|
|
|
e247ba3db3
|
Renaming.
|
2024-06-14 13:07:19 +03:00 |
|
|
|
b7fbb88185
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-14 12:32:13 +03:00 |
|
|
|
e02d05c43f
|
Merge branch 'develop' into feature/values-renaming
|
2024-06-14 12:19:34 +04: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 |
|
|
|
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 |
|
|
|
a6c91aa37c
|
Login: delete useless
|
2024-06-13 16:40:42 +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 |
|
|
|
5e31dc4785
|
Login: delete console log
|
2024-06-13 11:29:03 +03:00 |
|
|
|
97922ca6c6
|
Login: fix login logo theme
|
2024-06-13 10:59:36 +03:00 |
|
