|
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 |
|
|
625a7aa5a6
|
JS-SDK: Added onNoAccess event
|
2024-08-13 18:10:38 +03:00 |
|
|
36226366d3
|
Fixed Bug 68537: JS-SDK: Restored missing value for viewTableColumns option
|
2024-08-13 17:26:44 +03:00 |
|
Akmal Isomadinov
|
1f3bc2c502
|
Web:EmptyContainer Added empty screen for the trash page
|
2024-08-13 16:14:31 +05:00 |
|
Akmal Isomadinov
|
53e41f461b
|
Web:Public:Images Added new icons
|
2024-08-13 15:58:58 +05:00 |
|
|
42da002eef
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js
|
2024-08-13 13:57:10 +04:00 |
|
|
6d0f5ee519
|
JS-SDK: SDK bumped to 1.0.1 version. Added showHeaderBanner option for header info bar configuration
|
2024-08-13 11:39:54 +03: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 |
|
Akmal Isomadinov
|
cd20d199c7
|
Web:Public:Images Added new icons
|
2024-08-12 17:29:45 +05:00 |
|
Akmal Isomadinov
|
f37467a217
|
Merge branch 'develop' into feature/new-empty-screen
|
2024-08-12 11:51:13 +05: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 |
|
Akmal Isomadinov
|
f1231446e2
|
Web:EmptyContainer Added rooms empty options
|
2024-08-09 17:17:27 +05:00 |
|
Akmal Isomadinov
|
2dc9a52ba4
|
Web:Public:Images Added new icons
|
2024-08-08 19:34:50 +05: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 |
|
|
dd1996b37b
|
edited translations
|
2024-08-08 11:26:24 +03:00 |
|
Akmal Isomadinov
|
ff81b58c9e
|
Merge branch 'develop' into feature/new-empty-screen
|
2024-08-08 13:03:43 +05:00 |
|
|
81a7458921
|
edited de
|
2024-08-08 10:36:46 +03:00 |
|
|
665dc98870
|
added translations
|
2024-08-07 13:27:58 +03:00 |
|
|
a5fb33ba7e
|
added translations
|
2024-08-06 17:07:50 +03:00 |
|
|
3df780c3c9
|
added translations
|
2024-08-06 13:37:18 +03:00 |
|
|
25f11b05c8
|
added translations
|
2024-08-05 18:40:08 +03:00 |
|
Akmal Isomadinov
|
88b4c17bb5
|
Web:Public:Images Added new icons
|
2024-08-05 17:59:33 +05:00 |
|
|
34a5785660
|
added translations
|
2024-08-05 15:25:46 +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 |
|
|
7c85b7038c
|
added translations
|
2024-08-02 18:50:28 +03:00 |
|
Akmal Isomadinov
|
5f35458bc1
|
Merge branch 'develop' into feature/new-empty-screen
|
2024-08-02 20:00:30 +05:00 |
|
Akmal Isomadinov
|
738fb331f6
|
Web:Public:Images Added new icons
|
2024-08-02 19:58:46 +05: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 |
|
|
4b95ba4875
|
Merge branch 'develop' into feature/security-active-sessions
|
2024-08-02 13:28:25 +04:00 |
|
|
21b585fc7e
|
Web: Shared: LinkRow: reworked link regeneration to link deletion
|
2024-08-01 17:28:02 +03:00 |
|
|
adc9d0c3db
|
Merge branch 'hotfix/v2.6.1' into feature/translations_v2.6
# Conflicts:
# packages/client/public/locales/en/Translations.json
# packages/client/public/locales/lo-LA/Settings.json
|
2024-08-01 18:08:40 +04: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 |
|
Akmal Isomadinov
|
443c23936d
|
Web:Public:Images Added new icons
|
2024-08-01 18:03:15 +05:00 |
|
Akmal Isomadinov
|
cffd4c66b7
|
Web:Public:Images Fixed icon color
|
2024-08-01 18:02:51 +05:00 |
|
|
171b60e553
|
Add lo, ru; numerious fixes for multiple languages
|
2024-08-01 13:14:48 +03:00 |
|
|
a943f0df38
|
Scripts: BrowserDetector: Fixed minimum version for mobile safari
|
2024-08-01 12:32:29 +03:00 |
|
|
873d91e977
|
Fix Bug 65023 - Files. Added confirmation dialog when copying/moving a folder
|
2024-07-31 12:03:59 +03:00 |
|
|
948add3bf4
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-07-30 20:33:27 +04:00 |
|
|
b38ac0d9e6
|
Scripts: BrowserDetector: Fixed minimum version for desktop safari
|
2024-07-30 14:41:55 +03:00 |
|
|
ed344424c0
|
Merge branch 'develop' into feature/security-active-sessions
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
# packages/client/src/store/DialogsStore.js
# packages/client/src/store/SettingsSetupStore.js
|
2024-07-29 17:53:25 +05: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 |
|
|
bbcff840ad
|
Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-19 17:15:59 +03:00 |
|
|
ea46b0496c
|
Add translations for ZH
|
2024-07-19 17:15:22 +03:00 |
|
|
478366acfb
|
Merge branch 'release/v2.6.0' into feature/regional-logo
|
2024-07-19 16:08:52 +04:00 |
|
|
4dca95bb82
|
images: added regional logos
|
2024-07-19 15:06:42 +03: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 |
|
Akmal Isomadinov
|
820f32dd67
|
Doceditor:Components:CompletedForm Added a new design
|
2024-07-13 21:17:08 +05:00 |
|
|
c2fc3eada7
|
Merge branch 'develop' into feature/public-edit
|
2024-07-11 13:00:47 +03:00 |
|
|
e7e6b5c48a
|
Merge branch 'develop' into feature/security-active-sessions
|
2024-07-11 12:30:51 +04: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 |
|
|
06ee26f1cf
|
Merge branch 'develop' into feature/security-active-sessions
# Conflicts:
# packages/shared/components/table/Table.types.ts
|
2024-07-10 22:12:03 +05:00 |
|
|
3a3c4a6d3c
|
Web: Files: added public-room editing
|
2024-07-10 19:07:53 +03:00 |
|
Akmal Isomadinov
|
a4b7a3663e
|
Merge branch 'release/v2.6.0' into feature/form-room
|
2024-07-10 18:26:12 +05:00 |
|
Akmal Isomadinov
|
76fe42b1f0
|
Client:Components:CreatedPDFFormDialog Added checkbox and changed functionality
|
2024-07-10 18:22:25 +05:00 |
|
|
d7bd794854
|
Fix Bug 69074
|
2024-07-10 13:56:21 +03:00 |
|
|
b1b7c75941
|
Fix UselessTranslationKeysTest issues
|
2024-07-10 13:16:14 +04:00 |
|
Akmal Isomadinov
|
773c36839f
|
Shared:Components:Selector: Added info bar
|
2024-07-09 18:39:34 +05:00 |
|
Akmal Isomadinov
|
0eba3145e5
|
Shared:Components:Selector:Fixed icon size
|
2024-07-09 12:42:36 +05:00 |
|
Akmal Isomadinov
|
9233ab844b
|
Client Fixed translations
|
2024-07-09 12:27:56 +05:00 |
|
Akmal Isomadinov
|
4cb330bca8
|
Shared:Components:Selector Added empty screen
|
2024-07-08 19:39:48 +05:00 |
|
Akmal Isomadinov
|
7ff6ccd604
|
Web:Public:Images: Added icons
|
2024-07-08 19:36:43 +05:00 |
|
Akmal Isomadinov
|
eab4ef7d64
|
Merge branch 'release/v2.6.0' into feature/form-room
|
2024-07-08 16:53:59 +05:00 |
|
|
0d7a02a7fc
|
Fix Bug 69003 - Hide history display for rooms based on third-party storage.
|
2024-07-08 13:00:54 +03:00 |
|
Akmal Isomadinov
|
0474be1fa0
|
Client:Components: Added ShareCollectSelector
|
2024-07-05 16:59:43 +05:00 |
|
|
dd435561a5
|
setup default config for oauth origin parameter
|
2024-07-04 18:51:04 +03:00 |
|
|
ec50a38834
|
Fix Bug 68956: Wrong documents icon on tablet/mobile
|
2024-07-03 13:20:59 +02:00 |
|
|
c69e321daa
|
Fix bug 68262 - Add hint text above the new password input.
|
2024-07-02 16:01:27 +03:00 |
|
|
5f712f87f3
|
Add oauth origin for client config
|
2024-06-28 18:44:39 +03:00 |
|
|
7b81e7c384
|
Merge branch 'develop' into feature/security-active-sessions
# Conflicts:
# public/locales/en/Common.json
# public/locales/ru/Common.json
# yarn.lock
|
2024-06-25 21:24:23 +05:00 |
|
|
0fb2b762c0
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-24 14:01:36 +03:00 |
|
|
35ef0b8832
|
images: notifications: new icon
|
2024-06-22 15:08:03 +03:00 |
|
|
8c976678d2
|
Merge branch 'develop' into feature/embedding-settings
|
2024-06-21 11:38:29 +04:00 |
|
|
51bb9ccbfe
|
Translations: Fix EmptyValueKeysTest issues
|
2024-06-20 16:51:42 +04:00 |
|
|
056cad63a4
|
Merge branch 'develop' into feature/embedding-settings
|
2024-06-20 15:41:14 +03:00 |
|
|
b5ae010c29
|
Translations: Fix WrongTranslationVariablesTest issues
|
2024-06-20 16:27:14 +04:00 |
|
|
13cc8c1ad5
|
Translations: Fix UselessTranslationKeysTest
|
2024-06-20 15:29:24 +04:00 |
|
|
8283ed16e6
|
Merge branch 'develop' into feature/sr-cyrl
|
2024-06-20 12:46:42 +04:00 |
|
|
f713c56f50
|
added empty screen
|
2024-06-19 20:02:37 +05:00 |
|
|
f16ba9f57e
|
Public:Scripts:Config: add oauth2 publicClient flag
|
2024-06-19 15:19:18 +03:00 |
|
|
252eb14be5
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-19 15:16:18 +03:00 |
|
|
405879c64d
|
fixed translates
|
2024-06-19 16:40:41 +05:00 |
|
Akmal Isomadinov
|
99cd9ad8cc
|
Merge branch 'develop' into bugfix/form-room
|
2024-06-19 15:59:19 +05:00 |
|
Akmal Isomadinov
|
4d48d3563e
|
Public:Locales Fixed translation
|
2024-06-19 14:47:38 +05:00 |
|
Akmal Isomadinov
|
a9f38e7586
|
Client:Home:InfoPanel Added anonymous
|
2024-06-19 14:45:57 +05:00 |
|
|
4484cc42c5
|
fix bad merge
|
2024-06-19 12:42:05 +05:00 |
|
|
c10aec0122
|
Merge branch 'develop' into feature/security-active-sessions
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/ru/Settings.json
# packages/client/src/HOCs/withPeopleContent.js
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/helpers/people-helpers.js
# packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
# packages/client/src/store/SelectionPeopleStore.js
# packages/shared/enums/index.ts
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2024-06-19 11:46:30 +05:00 |
|