|
2430b052fa
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-30 13:11:09 +04:00 |
|
|
70cf8fc8e5
|
Merge branch 'hotfix/v2.6.1' into feature/last-activity
|
2024-08-30 13:00:54 +04:00 |
|
|
5be445082f
|
added translations
|
2024-08-29 14:10:07 +03:00 |
|
|
ee7fe469b2
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/Home/Section/Body/TableView/sub-components/RecentRowData.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledCertificatesTable.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/CertificatesTable.js
# packages/client/src/pages/Wizard/index.js
# packages/client/src/store/TableStore.js
# packages/shared/themes/base.ts
# packages/shared/themes/dark.ts
|
2024-08-29 14:27:18 +04:00 |
|
Vlada Gazizova
|
6400c71169
|
Client:Change translation Context to Location.
|
2024-08-29 11:55:00 +03:00 |
|
|
75c63c91b9
|
Merge branch 'feature/default-column-view' of github.com:ONLYOFFICE/DocSpace-client into feature/default-column-view
|
2024-08-28 17:47:30 +04:00 |
|
|
e08a799de5
|
Merge branch 'hotfix/v2.6.1' into feature/default-column-view
|
2024-08-28 17:47:18 +04:00 |
|
Vlada Gazizova
|
ced5170da4
|
Changed translation in alphabetical order.
|
2024-08-28 16:43:42 +03:00 |
|
Vlada Gazizova
|
173973cf59
|
Client:Table:In rooms, the Modified column has been replaced with Last Activity, and in the sort column, Last Modified Date has been replaced with Last Activity Date.
|
2024-08-28 16:17:41 +03:00 |
|
|
40626da6f2
|
Fix Bug 69825 - Settings:QuotaPerRoom. Added dialog about exceeding quota during upload
|
2024-08-27 14:15:02 +03:00 |
|
|
11fe4f4942
|
Merge branch 'develop' into feature/new-empty-screen
# Conflicts:
# packages/client/src/components/EmptyContainer/index.js
# public/locales/en/Common.json
|
2024-08-23 20:48:21 +04:00 |
|
|
1b6d4fb103
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/client/package.json
# packages/shared/themes/base.ts
# yarn.lock
|
2024-08-23 20:41:35 +04:00 |
|
Akmal Isomadinov
|
5995b8c8e0
|
Client:EmptyScreenGroups Added new empty screen for groups
|
2024-08-23 18:29:09 +05:00 |
|
|
e21ecd0f3e
|
Merge branch 'hotfix/v2.6.1' into bugfix/about-license
|
2024-08-22 16:58:58 +04:00 |
|
|
b2fc06a201
|
Translations: Fix ForbiddenValueElementsTest issue
|
2024-08-22 15:23:36 +04:00 |
|
|
3cae2e01ae
|
Merge branch 'hotfix/v2.6.1' into feature/translations-quotas
|
2024-08-22 15:18:11 +04:00 |
|
|
3dd14ccd49
|
Merge branch 'develop' into feature/new-empty-screen
|
2024-08-22 12:31:27 +04:00 |
|
|
e9f5327d7c
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/shared/components/room-icon/index.tsx
# packages/shared/themes/base.ts
# packages/shared/themes/dark.ts
# packages/shared/themes/globalColors.ts
|
2024-08-22 12:29:56 +04:00 |
|
|
c37e297ca4
|
Web: add translate
|
2024-08-21 23:16:01 +03:00 |
|
Akmal Isomadinov
|
05efe67fdc
|
Client:AccountsBody:EmptyScreen Added new empty screen for group
|
2024-08-20 20:59:22 +05:00 |
|
|
91f7292676
|
Web: Files: Fixed ThirdPartyComboBox
|
2024-08-20 15:06:31 +03:00 |
|
|
1d05a0aa9a
|
edited variable, added ro, pt-BR, de, fr, it, es
|
2024-08-20 14:19:06 +03:00 |
|
Akmal Isomadinov
|
62cf485588
|
Merge branch 'develop' into feature/new-empty-screen
# Conflicts:
# packages/client/src/components/EmptyContainer/index.js
# packages/client/src/pages/Home/Section/AccountsBody/EmptyScreen.js
# packages/client/src/store/ContextOptionsStore.js
|
2024-08-20 14:04:49 +05: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 |
|
|
189ae17034
|
Merge pull request #588 from ONLYOFFICE/feature/quota-limit
Feature/quota limit
|
2024-08-16 20:02:23 +04:00 |
|
|
32180ce6e2
|
Shared: OperationContainer: Added OperationContainer component
|
2024-08-16 15:53:38 +03:00 |
|
Akmal Isomadinov
|
b6374f020d
|
Web:EmptyContainer Added a empty screen for the filter
|
2024-08-15 16:24:22 +05: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 |
|
|
1100804723
|
Merge branch 'hotfix/v2.6.1' into feature/quota-limit
|
2024-08-12 17:42:28 +03:00 |
|
|
2cfbca7d27
|
SSO: Moved ResetConfirmationModal to client components
|
2024-08-12 16:38:06 +04:00 |
|
|
3094409fa8
|
Client: Added a notification about how much the quota is exceeded when trying to invite a paid user.
|
2024-08-08 13:29:43 +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 |
|
|
cd0fb0e4e0
|
Translations: Fix UselessTranslationKeysTest issues
|
2024-08-02 17:34:28 +04:00 |
|
|
88c0df3a88
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-02 17:24:09 +04:00 |
|
|
fd81e8e302
|
Merge branch 'hotfix/v2.6.1' into bugfix/65023
|
2024-08-02 16:56:14 +04:00 |
|
|
ab6f8a9e8a
|
Web: Doceditor: FilePassword: fixed text styles
|
2024-08-02 14:13:55 +03:00 |
|
|
35edf993ca
|
Fix Bug 69046 - Rooms. Added password dialog for public files
|
2024-08-02 13:17:03 +03:00 |
|
|
21b585fc7e
|
Web: Shared: LinkRow: reworked link regeneration to link deletion
|
2024-08-01 17:28:02 +03:00 |
|
|
873d91e977
|
Fix Bug 65023 - Files. Added confirmation dialog when copying/moving a folder
|
2024-07-31 12:03:59 +03:00 |
|
|
a5640c4628
|
Add translations for multiple languages
|
2024-07-26 15:04:24 +03:00 |
|
|
1972f6dc15
|
Merge branch 'develop' into feature/public-edit
# Conflicts:
# public/locales/en/Common.json
|
2024-07-25 11:25:59 +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 |
|
|
a98b6adba7
|
Merge branch 'release/v2.6.0' into feature/confirmation-screen
|
2024-07-20 12:57:17 +04:00 |
|
Akmal Isomadinov
|
e4cfaa244a
|
Client: move translation LinkCopySuccess to Common
|
2024-07-19 20:51:39 +05:00 |
|
|
080f560a38
|
Client: Added/applied ProductEditorsName translation key
|
2024-07-19 13:17:40 +04:00 |
|
|
292d420caa
|
Rebranding: move PRODUCT_NAME to Common.json
|
2024-07-18 18:48:09 +04:00 |
|
|
205df2f68b
|
Rebranding: move organizationName to Common.json
|
2024-07-18 18:20:37 +04:00 |
|
|
aee66ff680
|
Translations: fix UselessTranslationKeysTest issues
|
2024-07-17 15:36:49 +04:00 |
|
|
c2fc3eada7
|
Merge branch 'develop' into feature/public-edit
|
2024-07-11 13:00:47 +03:00 |
|