|
fdcac6f4da
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-30 11:56:18 +04:00 |
|
|
1df9df59d6
|
Web:Common:Add showTwoProgress props.
|
2023-05-29 16:32:58 +03:00 |
|
|
19e8b2210a
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/helpers/constants.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/pages/Home/index.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/common/components/Section/index.js
# packages/components/floating-button/styled-floating-button.js
# packages/login/src/client/App.tsx
# packages/login/src/client/components/Invalid/index.tsx
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# yarn.lock
|
2023-05-29 14:36:12 +03:00 |
|
|
9599a68e2b
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-26 18:39:55 +04:00 |
|
|
1a2d5f3d5a
|
Web:Adding history for FloatingButton in the Components module.
|
2023-05-26 14:39:19 +03:00 |
|
|
ff5ad1c5e4
|
Web:Moved the FloatingButton component from the Common module to the Components module.
|
2023-05-25 16:36:54 +03:00 |
|
|
6e723a37a1
|
Web:Moved the Tags component from the Common module to the Components module.
|
2023-05-25 16:12:45 +03:00 |
|
|
a75e919a6e
|
Web:Common:Delete StyledWrapper.
|
2023-05-25 12:02:05 +03:00 |
|
|
ae5b3667ac
|
Web:Moved LoginContainer to a separate file.
|
2023-05-25 12:00:05 +03:00 |
|
|
334da537a6
|
Web:Delete StyledCircleWrap.
|
2023-05-25 11:56:19 +03:00 |
|
|
7907e6563f
|
Web:Moved StyledCircleWrapFloatingButton to separate file.
|
2023-05-25 11:55:29 +03:00 |
|
|
bcf9c9c65f
|
Web:Moved StyledFilterBlockItemTag to separate file.
|
2023-05-25 11:54:48 +03:00 |
|
|
1ef9ad529c
|
Web: Changed adding a theme using a class, moved the picture to a component, removed it from Common.
|
2023-05-25 11:53:52 +03:00 |
|
|
95c834ed6b
|
Web: Moving style components, adding a class to get rid of the import of components from the Common module in the ColorTheme components.
|
2023-05-24 18:30:20 +03:00 |
|
|
b72b96c8c9
|
Web: Replacing import "@docspace/common/components/ColorTheme" with "@docspace/components/ColorTheme".
|
2023-05-24 18:28:06 +03:00 |
|
|
47fe313f9d
|
Web:Moving style components to colorTheme components to get rid of component imports from the Common module. Moving the colorTheme components to the Components module.
|
2023-05-24 18:21:37 +03:00 |
|
|
ff174d6b9c
|
Web:Common:Delete ColorTheme from Common.
|
2023-05-24 18:16:20 +03:00 |
|
Viktor Fomin
|
e1dbfe08ca
|
Fix Bug 62130: If you set a filter with a very long tag, a horizontal scrollbar appears
|
2023-05-22 13:34:47 +03:00 |
|
Mushka Nikita
|
191de3e991
|
added filter by room to trash
|
2023-05-22 12:27:09 +03:00 |
|
|
6e0cee2f74
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2023-05-18 15:40:58 +03:00 |
|
|
ccd5da84ce
|
Web:Common:Fixed when several file operations are running at the same time (deleting files and downloading) the floating download button ceases to be iterative, does not click.
|
2023-05-18 15:39:57 +03:00 |
|
Akmal Isomadinov
|
a5669a14eb
|
Web: Fixed upload indicator
|
2023-05-18 16:45:36 +05:00 |
|
|
85205659ec
|
Fix UselessModuleTranslationKeysTest issue (key: Copy)
|
2023-05-15 16:34:09 +04:00 |
|
|
3d40fdd1e5
|
Fix UselessModuleTranslationKeysTest issue (key: Rename)
|
2023-05-15 16:22:34 +04:00 |
|
|
7638c25dc0
|
Fix UselessModuleTranslationKeysTest issue (key: MoveTo)
|
2023-05-15 16:16:15 +04:00 |
|
|
356ba08300
|
Fix UselessModuleTranslationKeysTest issue (key: HideArticleMenu)
|
2023-05-15 16:00:14 +04:00 |
|
|
17888b7421
|
Fix UselessModuleTranslationKeysTest issue (key: CancelButton)
|
2023-05-15 15:58:01 +04:00 |
|
|
db1bcf5fc3
|
Fix UselessModuleTranslationKeysTest issue (key: Authorization)
|
2023-05-15 15:35:09 +04:00 |
|
|
70d81fc799
|
Fix UselessModuleTranslationKeysTest issue (key: ApplyButton)
|
2023-05-15 14:42:46 +04:00 |
|
|
e96252937d
|
Web: Payment alert description changed.
|
2023-05-11 18:30:39 +03:00 |
|
|
59c333d994
|
Merge branch 'hotfix/v1.0.1' into bugfix/sort-styling
|
2023-05-04 18:32:33 +04:00 |
|
Viktor Fomin
|
e63e71b9fa
|
Common: MoreLoginModal: fix icons color
|
2023-05-03 14:17:18 +03:00 |
|
Timofey Boyko
|
6b95388510
|
Fixed Bug 60591 - Mobile. Maximizing video to full screen does not work on IPhone
|
2023-05-02 18:29:00 +03:00 |
|
Mushka Nikita
|
f02d1caff7
|
fixed sort menu hover styling
|
2023-05-02 13:01:04 +03:00 |
|
Timofey Boyko
|
8dbdcf9cf5
|
Merge branch 'develop' into branch bugfix/fix-section-blinking
|
2023-05-02 11:10:02 +03:00 |
|
Viktor Fomin
|
a05b1528e3
|
Common: RecoverAccessModalDialog: add error message
|
2023-05-01 14:16:01 +03:00 |
|
|
25fed493da
|
Merge branch 'develop' into feature/action-buttons-hints
|
2023-04-28 17:10:46 +04:00 |
|
Timofey Boyko
|
fbbc7721be
|
Web:Client: move Settings as nested route to home
|
2023-04-27 16:21:34 +03:00 |
|
Mushka Nikita
|
e2a1a3be00
|
added and returned optional chaining to some bool expressions in tags
|
2023-04-27 15:55:31 +03:00 |
|
Mushka Nikita
|
c590e5774f
|
fixed thirdpart tag update logic
|
2023-04-27 15:06:55 +03:00 |
|
Mushka Nikita
|
b417ae0365
|
Merge branch 'develop' into feature/thirdparty
|
2023-04-26 15:02:13 +03:00 |
|
Mushka Nikita
|
25f38556ab
|
fix sort dropdown option gap
|
2023-04-25 14:48:42 +03:00 |
|
|
db976e019e
|
Web: Fix routing to login (logout issues)
|
2023-04-24 14:25:14 +04:00 |
|
|
190fb7e5e7
|
Merge branch 'develop' into feature/action-buttons-hints
# Conflicts:
# packages/client/public/locales/en/Files.json
# packages/client/public/locales/ru/Files.json
# packages/client/src/pages/Home/InfoPanel/Header/index.js
|
2023-04-20 15:39:46 +03:00 |
|
|
bccb3c86e3
|
Web: Files: added titles to info-panel icon, table-settings icon
|
2023-04-20 15:35:56 +03:00 |
|
|
3348134c28
|
Web: Files: added title to VersionHistory
|
2023-04-20 13:41:23 +03:00 |
|
|
464aed0f62
|
Merge branch 'develop' into feature/info-panel-toggle
|
2023-04-20 13:59:27 +04:00 |
|
|
f6bcfc05d4
|
Web: Files: added titles to MainButton, empty trash icon, lock icon, header menu
|
2023-04-20 12:43:51 +03:00 |
|
Mushka Nikita
|
d9fa1c91d8
|
fix crash
|
2023-04-20 11:47:46 +03:00 |
|
|
48f9073302
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-20 12:31:46 +04:00 |
|