|
|
caf1512d30
|
Merge branch 'develop' into bugfix/oauth2-scope
|
2024-08-20 10:07:02 +03:00 |
|
|
|
b5346bb045
|
Client:PortalSettings:OAuth: add validate developer token
|
2024-08-19 17:21:51 +03:00 |
|
|
|
556df6e20c
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
# packages/client/src/components/dialogs/ChangeUserStatusDialog/index.js
# packages/client/src/pages/Confirm/sub-components/auth.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/store/DialogsStore.js
# packages/shared/components/access-right-select/AccessRightSelect.tsx
|
2024-08-19 17:26:45 +04:00 |
|
|
|
4ae56b7301
|
Shared:API:OAuth2: add introspect developer token method
|
2024-08-19 15:49:27 +03:00 |
|
|
|
7fff40a677
|
Shared: Deleted useless code.
|
2024-08-16 15:41:00 +03:00 |
|
|
|
c7178bde0e
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-15 19:02:58 +04:00 |
|
|
|
a06cb5159f
|
Merge pull request #587 from ONLYOFFICE/feature/oauth2-rotation
Feature/oauth2 rotation
|
2024-08-15 17:55:07 +04:00 |
|
|
|
b3dd681065
|
Shared:API:OAuth2: add revoke and generate developer token methods
|
2024-08-15 16:19:27 +03:00 |
|
|
|
ada7d8c960
|
Shared:Utils:Axios: add generic for API types
|
2024-08-15 16:18:59 +03:00 |
|
|
|
706380fcbf
|
Fix Bug 69519 - Accounts. Sorting by Last name field does not work
|
2024-08-15 16:55:39 +04:00 |
|
|
|
3dac1a4874
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/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/index.js
# 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/UsersTableRow.tsx
# packages/shared/components/share/sub-components/LinkRow.tsx
|
2024-08-14 12:47:36 +04:00 |
|
|
|
097adc82d5
|
Client: EditGroupStore: Fix moving manager to members without setting new manager
|
2024-08-13 17:45:19 +02:00 |
|
|
|
0c48a11f07
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/login/src/app/(root)/page.tsx
# packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx
|
2024-08-12 19:10:02 +04:00 |
|
|
|
c9661b2745
|
Merge branch 'hotfix/v2.6.1' into bugfix/huge-group-issues
|
2024-08-12 13:07:44 +04:00 |
|
Vlada Gazizova
|
21d08cc691
|
Fixed Bug 69577: Srv: Branding. Blank page for "Feedback & Support" when "Show link to Help Center" is disabled
|
2024-08-09 17:41:52 +03:00 |
|
|
|
a2302aa248
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/client/src/components/PrivateRouteWrapper/index.tsx
# packages/client/src/pages/Confirm/sub-components/activateUser.js
# packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/CertificateDialog.js
# packages/client/src/pages/PublicRoom/sub-components/RoomStyles.js
# packages/login/src/app/(root)/layout.tsx
# packages/login/src/app/(root)/page.tsx
# packages/login/src/app/layout.tsx
# packages/login/src/components/LoginForm/index.tsx
# packages/login/src/types/index.ts
# packages/login/src/utils/actions.ts
# packages/shared/constants/index.ts
# packages/shared/themes/base.ts
|
2024-08-09 17:23:25 +04:00 |
|
|
|
844daabd2f
|
Client: CreateGroupDialog: Fix create dialog after rewriting edit dialog
|
2024-08-09 09:41:15 +02:00 |
|
|
|
a8e5a244f7
|
Client: EditGroupDialog: Rewrite dialog to work with infinite loader
|
2024-08-09 09:41:15 +02:00 |
|
|
|
fdc06cf61c
|
Client: InfoPanel Groups: Fix getting all members in one request. Add infinite loader
|
2024-08-09 09:41:15 +02:00 |
|
|
|
ee3ff7ed09
|
Merge branch 'hotfix/v2.6.1' into feature/api-separation
|
2024-08-08 14:38:16 +04:00 |
|
|
|
46bfdde9fc
|
Shared: Fixed type.
|
2024-08-07 16:47:17 +03:00 |
|
|
|
a15e40d24d
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/shared/components/share/sub-components/LinkRow.tsx
|
2024-08-07 11:47:58 +04:00 |
|
|
|
b549c262a7
|
Deleted useless code.
|
2024-08-06 13:47:54 +03:00 |
|
|
|
544489b2b3
|
Deleted useless code.
|
2024-08-06 13:46:47 +03:00 |
|
|
|
50f593032b
|
Deleted useless request.
|
2024-08-06 10:12:27 +03:00 |
|
|
|
4bc417422e
|
Merge branch 'hotfix/v2.6.1' into feature/api-separation
# Conflicts:
# packages/shared/store/AuthStore.ts
|
2024-08-06 09:28:05 +03:00 |
|
|
|
6601566913
|
Shared: Api: People: Added loginEventId to user type
|
2024-08-05 17:58:59 +03:00 |
|
|
|
5c9a26987c
|
Merge branch 'develop' into feature/public-edit
# Conflicts:
# packages/shared/api/rooms/index.ts
|
2024-08-05 15:37:22 +04:00 |
|
|
|
f47a65777b
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-05 15:35:03 +04:00 |
|
|
|
ac1b85aef3
|
Confirm: OAuth user creation fix (add header)
|
2024-08-05 13:24:25 +04:00 |
|
|
|
88c0df3a88
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-02 17:24:09 +04:00 |
|
|
|
35edf993ca
|
Fix Bug 69046 - Rooms. Added password dialog for public files
|
2024-08-02 13:17:03 +03:00 |
|
|
|
e7d651811c
|
Merge branch 'develop' into feature/public-edit
# Conflicts:
# packages/shared/components/access-right-select/AccessRightSelect.styled.ts
|
2024-08-01 16:34:06 +03:00 |
|
|
|
948add3bf4
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-07-30 20:33:27 +04:00 |
|
|
|
ab2f184dad
|
Merge branch 'hotfix/v2.6.1' into bugfix/save-table-sorting
|
2024-07-30 20:09:02 +04:00 |
|
|
|
941ee2dce0
|
Merge branch 'hotfix/v2.6.1' of github.com:ONLYOFFICE/DocSpace-client into hotfix/v2.6.1
|
2024-07-30 14:03:30 +03:00 |
|
|
|
d817280f88
|
Shared: Api: Portal: Fixed getInvitationLink method
|
2024-07-30 14:00:38 +03:00 |
|
Vlada Gazizova
|
4f12114124
|
Shared: Fix filter const sortBy and sortOrder as url.
|
2024-07-30 11:16:37 +03:00 |
|
Akmal Isomadinov
|
181f311781
|
Web: Removed useless code
|
2024-07-30 13:15:05 +05:00 |
|
|
|
4615b68dc1
|
Merge branch 'develop' into feature/public-edit
|
2024-07-29 16:57:28 +04:00 |
|
|
|
d194cfeaa6
|
Merge branch 'develop' into feature/convert-xml-dialog
|
2024-07-29 16:25:06 +04:00 |
|
|
|
072ce77b8a
|
Merge branch 'develop' into feature/public-edit
|
2024-07-29 16:22:00 +04:00 |
|
|
|
602ce53411
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersStep/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/RowView/UsersRowContent.tsx
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
|
2024-07-29 16:13:17 +04:00 |
|
|
|
1972f6dc15
|
Merge branch 'develop' into feature/public-edit
# Conflicts:
# public/locales/en/Common.json
|
2024-07-25 11:25:59 +03:00 |
|
|
|
46063047c9
|
Client: EditGroupMembersDialog: Add infinite scroll and search from server
|
2024-07-23 12:49:08 +02: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 |
|
|
|
bb31e9a89d
|
Web: Client: Dialogs: ConvertDialog. the values for conversion have been changed
|
2024-07-19 17:45:43 +05:00 |
|
|
|
e82fedc10d
|
Bug 69255 - Files.Uploads. Request failed with status code 429
|
2024-07-19 15:10:45 +03:00 |
|
|
|
0728dd4ee3
|
Merge branch 'develop' into feature/convert-xml-dialog
|
2024-07-18 15:11:16 +05:00 |
|
|
|
51a92b1309
|
Added skipRedirect for severals api.
|
2024-07-16 16:50:07 +03:00 |
|
