|
|
b5346bb045
|
Client:PortalSettings:OAuth: add validate developer token
|
2024-08-19 17:21:51 +03:00 |
|
|
|
c7178bde0e
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-15 19:02:58 +04:00 |
|
|
|
ada7d8c960
|
Shared:Utils:Axios: add generic for API types
|
2024-08-15 16:18:59 +03:00 |
|
|
|
cfc7cf0114
|
Shared: Utils: Fixed force redirect inside frame on 401 response
|
2024-08-15 14:54:54 +03:00 |
|
|
|
cfcc10e98e
|
Merge pull request #578 from ONLYOFFICE/feature/move-quick-buttons
Feature/move quick buttons
|
2024-08-12 19:43:35 +04: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 |
|
|
|
7332d45c03
|
Shared:Utils:Common: pass culture to handler logo url
|
2024-08-12 15:40:03 +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 |
|
|
|
024e5de12b
|
Web: Files: EditLinkPanel: replaced PasswordInput with SimulatePassword
|
2024-08-07 16:41:45 +03:00 |
|
Vlada Gazizova
|
540693ac29
|
Merge branch 'develop' into feature/move-quick-buttons
|
2024-08-07 15:40:17 +03:00 |
|
|
|
ebbdbaab73
|
Merge branch 'develop' into refactoring/global-colors
|
2024-08-07 14:18:27 +04: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 |
|
|
|
0ddcfd8b62
|
Web: Components: InfiniteLoader: added skeleton when quickly scrolling the list, added skeleton for room tiles
|
2024-08-06 14:34:33 +03:00 |
|
Vlada Gazizova
|
2de66aab89
|
Merge branch 'develop' into feature/move-quick-buttons
|
2024-08-05 19:00:29 +03:00 |
|
|
|
c708b6cda3
|
Merge branch 'develop' into refactoring/global-colors
|
2024-08-05 14:01:25 +03:00 |
|
|
|
88c0df3a88
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-02 17:24:09 +04:00 |
|
Vlada Gazizova
|
f62d9ee64d
|
Shared:Changing the function to display the last column and the Name column too.
|
2024-08-01 14:51:01 +03:00 |
|
|
|
a453b1e8b4
|
Shared: Utils: Common: Added showProgress for operations progress
|
2024-08-01 14:04:34 +03:00 |
|
|
|
447003315c
|
Merge branch 'develop' into refactoring/global-colors
|
2024-07-30 13:00:40 +03:00 |
|
|
|
31323d26ba
|
Merge branch 'refs/heads/develop' into feature/rtl-refactor
# Conflicts:
# packages/client/src/components/ItemIcon.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomTypeDropdown/DropdownMobile.js
# packages/client/src/components/panels/EditLinkPanel/StyledEditLinkPanel.js
# packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js
# packages/client/src/components/panels/UploadPanel/FileRow.js
# packages/client/src/pages/FormGallery/Filter/SortFilter/index.styled.js
# packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/RowView/UsersRowContent.tsx
# packages/client/src/pages/PortalSettings/categories/storage-management/StyledComponent.js
# packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/styled-main-profile.js
# packages/shared/components/media-viewer/MediaViewer.styled.ts
|
2024-07-29 15:28:49 +02: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 |
|
|
|
38af49f027
|
Web: Components: Table: fixed imports
|
2024-07-25 17:11:35 +03:00 |
|
|
|
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 |
|
|
|
0db5f272c6
|
Merge branch 'release/v2.6.0' into feature/edge-scrolling
|
2024-07-19 16:53:59 +04:00 |
|
|
|
292d420caa
|
Rebranding: move PRODUCT_NAME to Common.json
|
2024-07-18 18:48:09 +04:00 |
|
|
|
14431c9be4
|
Web: Components: added scrolling around edges
|
2024-07-18 13:24:38 +03:00 |
|
|
|
e08a86bd99
|
Merge branch 'refs/heads/develop' into feature/rtl-refactor
# Conflicts:
# 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/SelectUsersStep/AccountsTable/RowView/UsersRowContent.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/UsersTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTableRow.js
# 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/SelectUsersStep/AccountsTable/TableView/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/sub-components/StepLayout.tsx
|
2024-07-16 11:09:25 +02:00 |
|
|
|
ce5fd3f835
|
Shared: refactor rtl
|
2024-07-16 10:30:28 +02:00 |
|
|
|
9dd2820abc
|
Shared: AOuth: fix axios response data
|
2024-07-12 11:37:27 +04:00 |
|
|
|
320d882d86
|
Merge branch 'release/v2.6.0' into develop
|
2024-07-11 16:18:28 +04:00 |
|
|
|
9a5bad43f0
|
Shared:Utils:NextSSRHelper: fix sharelink headers
|
2024-07-11 11:46:23 +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 |
|
|
|
2abdc4f4d7
|
Shared: Fixed display of quota for archive room.
|
2024-07-10 14:59:13 +03:00 |
|
|
|
bb1092a5ec
|
Duplicate function removed.
|
2024-07-10 14:50:55 +03:00 |
|
|
|
f21cd91446
|
Renamed function.
|
2024-07-10 14:31:22 +03:00 |
|
|
|
ca460ca70a
|
Translations corrected.
|
2024-07-10 14:29:32 +03:00 |
|
|
|
bef5163c29
|
Shared:Utils:NextSSRHelper: set sharedlink as header
|
2024-07-09 11:25:34 +03:00 |
|
|
|
794586f725
|
Fix Bug 65234 - Rooms. Fixed default rights for invite users link
|
2024-07-05 12:58:59 +03:00 |
|
|
|
ec50a38834
|
Fix Bug 68956: Wrong documents icon on tablet/mobile
|
2024-07-03 13:20:59 +02:00 |
|
|
|
a42292cbc4
|
Fix bug 68260 - Accounts. Add a display of the user's role and a description of the role to his profile card.
|
2024-07-01 13:54:14 +03:00 |
|
Akmal Isomadinov
|
26dfc2f9bf
|
Doceditor:Utils:Actions Fixed Bug 68906
|
2024-07-01 12:41:47 +05:00 |
|
|
|
e2205d9387
|
Shared:Utils:OAuth: fix scope list render
|
2024-06-28 13:38:08 +03:00 |
|
|
|
8f4ddba367
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-28 13:28:10 +03:00 |
|
|
|
f612ba9edf
|
Shared:Utils:OAuth: fix scope list render
|
2024-06-28 13:19:31 +03:00 |
|
|
|
def151fe66
|
Client:OAuth: refactoring
|
2024-06-27 13:31:49 +03:00 |
|
|
|
57b73af294
|
Merge branch 'develop' into refactoring/global-colors
|
2024-06-26 17:00:39 +03:00 |
|
|
|
ab24a40a0e
|
Client:OAuth: refactoring
|
2024-06-26 15:19:13 +03:00 |
|
Vlada Gazizova
|
119c1bdba8
|
Shared:Table:Add getLastColumn, refactoring.
|
2024-06-25 17:39:28 +03:00 |
|
|
|
ffe98ad175
|
Shared:Utils: delete console log
|
2024-06-24 15:32:46 +03:00 |
|
