|
e277c8ac7b
|
Client: fix badges color
|
2024-07-24 16:32:22 +03:00 |
|
|
7a64964df2
|
Shared: Themes: add colors
|
2024-07-24 16:32:00 +03:00 |
|
|
3e508950d4
|
Client: fix after merge
|
2024-07-24 15:31:34 +03:00 |
|
|
14086fc550
|
Shared: fix after merge
|
2024-07-24 15:31:21 +03:00 |
|
|
28c03fdb6b
|
Shared: Themes: fix after merge
|
2024-07-24 15:26:11 +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 |
|
|
58eee4ddaf
|
Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-22 17:23:04 +04:00 |
|
|
6ce8d94809
|
Security: Hide block of days
|
2024-07-22 17:22:52 +04:00 |
|
|
9a924aa30e
|
Client: fix open report in same tab
|
2024-07-22 16:15:24 +03:00 |
|
|
1cd82dc5a4
|
Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-22 15:12:13 +03:00 |
|
|
04d3f01612
|
Web: Files: fixed StyledCircle
|
2024-07-22 15:12:06 +03:00 |
|
|
63e4ee3aff
|
Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-22 15:47:24 +04:00 |
|
|
2f80e76b04
|
Fix Bug 69320 - Files.Uploads. When loading a folder, temporary/hidden files are also loaded.
|
2024-07-22 15:47:19 +04:00 |
|
|
4c68b330db
|
Client: Branding: add offset for editor logo
|
2024-07-22 14:38:58 +03:00 |
|
Akmal Isomadinov
|
367f583e7d
|
Doceditor:Components:CompletedForm Fixed copy link file
|
2024-07-22 16:28:30 +05:00 |
|
Akmal Isomadinov
|
2c683c3ba6
|
Doceditor:Components:ConflictResolveDialog Fix
|
2024-07-22 15:50:27 +05:00 |
|
Akmal Isomadinov
|
deb638a5d1
|
Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-22 15:49:53 +05:00 |
|
Akmal Isomadinov
|
a32a3122a8
|
Doceditor:Components:CompletedForm Fixed styles
|
2024-07-22 15:49:34 +05:00 |
|
|
86913f183b
|
Update yarn.lock
|
2024-07-22 13:39:25 +04:00 |
|
|
6d161b4a31
|
Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-22 13:13:03 +04:00 |
|
|
64d1385542
|
Fix Bug 69324 - Settings: Branding. Tab breaks when saving empty Company name
|
2024-07-22 13:12:50 +04:00 |
|
Akmal Isomadinov
|
9819b1e223
|
Doceditor:Public:Locales:CompletedForm Fixed translation
|
2024-07-22 13:12:22 +05:00 |
|
|
4d7ff004dc
|
Merge pull request #556 from ONLYOFFICE/feature/confirmation-screen
Feature/confirmation screen
|
2024-07-20 13:32:09 +04:00 |
|
|
a98b6adba7
|
Merge branch 'release/v2.6.0' into feature/confirmation-screen
|
2024-07-20 12:57:17 +04:00 |
|
Akmal Isomadinov
|
18e1252fd8
|
Doceditor:Components:CompletedForm Added toast
|
2024-07-19 21:01:58 +05:00 |
|
Akmal Isomadinov
|
e4cfaa244a
|
Client: move translation LinkCopySuccess to Common
|
2024-07-19 20:51:39 +05:00 |
|
Akmal Isomadinov
|
e2aff7b4d4
|
Doceditor: Added filling Session
|
2024-07-19 20:34:47 +05:00 |
|
|
4aaf534c44
|
Client: StorageManagement: Fix diagram in rtl
|
2024-07-19 17:29:45 +02:00 |
|
|
7f08892037
|
Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-19 17:50:39 +03:00 |
|
|
bdda117ea6
|
Fix Bug 69299 - Rooms.Public.Storage. Fixed connect dialog
|
2024-07-19 17:50:27 +03:00 |
|
|
1bc4ea8606
|
Translations: Fix WrongTranslationTagsTest issue (DeletePortalText)
|
2024-07-19 18:49:49 +04:00 |
|
|
7ccefeaa57
|
Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-19 17:42:08 +03:00 |
|
|
aa18e42f44
|
Update ZH translations
|
2024-07-19 17:41:59 +03:00 |
|
|
c9723146fe
|
Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-19 19:30:07 +05:00 |
|
|
b39298e068
|
Fix Bug 69301 - Settings: Data Import: Extra character “\” in the error message (russian language)
|
2024-07-19 19:30:02 +05:00 |
|
|
72f1e3edb9
|
Editor: refactoring
|
2024-07-19 19:24:39 +05:00 |
|
|
c9177a0d54
|
Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-19 19:23:46 +05:00 |
|
|
1f7fd64d36
|
Fix Bug 69322 - Editor: fixed open file location in same tab
|
2024-07-19 19:23:34 +05:00 |
|
|
d2344bf5e0
|
Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-19 18:17:15 +04:00 |
|
|
fcb6d9dba2
|
Whitelabel: ban empty logoTextWhiteLabel
|
2024-07-19 18:17:04 +04:00 |
|
|
c1f48ba24e
|
Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-19 19:16:49 +05:00 |
|
|
05d5fc7bef
|
Fix Bug 69276 - Rooms: Info: History. When Revoke link the default link in the story, an empty action without description is displayed.
|
2024-07-19 19:16:41 +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 |
|
|
b091424f5d
|
Whitelabel: Fix hide skeletons on logoTextWhiteLabel equals empty string
|
2024-07-19 17:50:33 +04:00 |
|
|
912e16c3f4
|
Fix Bug 69323
When opening file from Upload panel in the same tab no Close button in Editor
|
2024-07-19 16:08:09 +03:00 |
|
|
d300a0fec3
|
Merge pull request #553 from ONLYOFFICE/feature/edge-scrolling
Web: Components: added scrolling around edges
|
2024-07-19 16:57:47 +04:00 |
|
|
0db5f272c6
|
Merge branch 'release/v2.6.0' into feature/edge-scrolling
|
2024-07-19 16:53:59 +04:00 |
|
|
8768b72dcc
|
Merge pull request #554 from ONLYOFFICE/feature/regional-logo
Feature/regional logo
|
2024-07-19 16:34:21 +04:00 |
|