|
|
2aed8eb3a0
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign
# Conflicts:
# packages/asc-web-components/index.js
# packages/client/src/DocspaceLogo/index.js
# packages/client/src/pages/Confirm/ConfirmWrapper.js
# packages/components/form-wrapper/index.js
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header-unauth.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/StyledConfirm.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaActivation.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaAuth.js
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/StyledLogin.js
|
2022-08-10 16:16:43 +03:00 |
|
|
|
53a4e15b52
|
Web: Components: FormWrapper: fix style
|
2022-07-26 13:22:01 +03:00 |
|
|
|
94cb5b0a18
|
Web: Components: init form wrapper
|
2022-07-25 19:27:34 +03:00 |
|
|
|
2e5f2cb7a6
|
Web: Components: Themes: fix padding
|
2022-07-23 01:39:54 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
|
|
93d7221388
|
Web: Components: IconButton: add height
|
2022-07-22 13:43:11 +03:00 |
|
|
|
180aa03d95
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-22 10:22:52 +03:00 |
|
|
|
afdd1b7908
|
Web: Components: ContextMenuButton: add iconClassName prop
|
2022-07-21 17:44:13 +03:00 |
|
Artem Tarasov
|
345dad709c
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-21 16:02:48 +03:00 |
|
|
|
831bdc578f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# packages/asc-web-common/components/Article/styled-article.js
# products/ASC.Files/Client/src/Files.jsx
|
2022-07-21 14:22:28 +03:00 |
|
TimofeyBoyko
|
d742e5529c
|
Web:Components:ContextMenu: delete useless code
|
2022-07-21 13:00:43 +03:00 |
|
TimofeyBoyko
|
77f8eecf78
|
Web:Files: fix header of context menu for rooms
|
2022-07-21 12:01:38 +03:00 |
|
TimofeyBoyko
|
1633d0782a
|
Web:Files:TableView: fix view at room folder when info panel is open
|
2022-07-21 11:24:24 +03:00 |
|
TimofeyBoyko
|
1f918c7ee8
|
Web:Components:MainButtonMobile: fix display for rooms
|
2022-07-20 17:03:14 +03:00 |
|
|
|
75042eedf0
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# packages/asc-web-common/components/Article/styled-article.js
|
2022-07-20 10:00:32 +03:00 |
|
TimofeyBoyko
|
684e28d188
|
Web:Components:TableContainer: fix color of icon for group menu items
|
2022-07-20 08:40:11 +03:00 |
|
TimofeyBoyko
|
0782af817f
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-20 08:36:31 +03:00 |
|
Artem Tarasov
|
4ddffad7b2
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-19 18:22:16 +03:00 |
|
TimofeyBoyko
|
709b40f338
|
Web:Components:MainButtonMobile: add withoutButton prop
|
2022-07-19 16:30:19 +03:00 |
|
|
|
93418bcac0
|
Web: Components: ContextMenu: fix
|
2022-07-19 16:11:54 +03:00 |
|
TimofeyBoyko
|
4614d3fb32
|
Web:Components:CatalogItem: fix position of badge icon
|
2022-07-19 15:52:49 +03:00 |
|
Artem Tarasov
|
10f2cde731
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# .gitignore
|
2022-07-18 17:05:53 +03:00 |
|
|
|
81aa52e074
|
Web: Components: Themes: fix menu header colors
|
2022-07-18 16:31:40 +03:00 |
|
|
|
afd5bc40f1
|
Web: Components: add theme
|
2022-07-18 16:00:14 +03:00 |
|
TimofeyBoyko
|
8832aece23
|
Web:Files: move logic from virtual room page to home page
|
2022-07-16 09:50:32 +03:00 |
|
|
|
fd6f4bc6e4
|
Web: Components: Themes: fix header background
|
2022-07-15 14:01:02 +03:00 |
|
mushka
|
d106647ecf
|
tweaked DownloadDialog and fixed overall aside body scroll
|
2022-07-14 17:45:18 +03:00 |
|
mushka
|
1b895976f5
|
fixed DownloadAs panel
|
2022-07-14 17:26:21 +03:00 |
|
TimofeyBoyko
|
33780332f7
|
Web:Components:CatalogItem: delete useless arg 'type' from onClick function
|
2022-07-14 07:11:57 +03:00 |
|
mushka
|
e4d07810e8
|
fixed aside height on mobile browser
|
2022-07-12 17:40:00 +03:00 |
|
TimofeyBoyko
|
09122918f6
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-12 16:19:00 +03:00 |
|
|
|
72b00ffe94
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 14:24:11 +03:00 |
|
mushka
|
45f2e63836
|
changed ConnectCloud dark theme and fixed ConsumerModalDialolg
|
2022-07-12 14:19:04 +03:00 |
|
|
|
404e014a59
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# products/ASC.Files/Client/src/Files.jsx
|
2022-07-12 14:18:29 +03:00 |
|
|
|
59121d0ced
|
Web: Components: add base avatar size
|
2022-07-12 11:02:00 +03:00 |
|
|
|
7b42f63d28
|
Web: Components: ContextMenuButton: fix warning
|
2022-07-11 22:53:12 +03:00 |
|
mushka
|
7d22e52c70
|
fixed mobile keyboard interaction with dialogs
|
2022-07-11 20:43:25 +03:00 |
|
mushka
|
ada4ab71b8
|
fixed backdrop height on mobile browsers
|
2022-07-11 17:37:28 +03:00 |
|
|
|
baea63043c
|
Web: Components: Utils: fix hugeMobile size
|
2022-07-11 14:48:25 +03:00 |
|
mushka
|
2fb38338e5
|
fixed backdrop and Debug dialog
|
2022-07-11 13:30:55 +03:00 |
|
Artem Tarasov
|
55198d0e7f
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# web/ASC.Web.Editor/src/i18n.js
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
|
2022-07-10 11:23:44 +03:00 |
|
mushka
|
58e68c1c12
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-08 17:23:02 +03:00 |
|
TimofeyBoyko
|
b9e8ae7edc
|
Web:Components:Tag: fix onClick function
|
2022-07-08 14:41:06 +03:00 |
|
TimofeyBoyko
|
c8feb7899b
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-08 12:32:26 +03:00 |
|
|
|
0da612710d
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings
|
2022-07-07 19:39:12 +03:00 |
|
mushka
|
89dd7ab365
|
fixed translations, styles and dark theme for ConnectCloud
|
2022-07-07 19:25:31 +03:00 |
|
|
|
dab94135cf
|
Web: Components: fixed onClickOutside eventTypes
|
2022-07-07 17:58:41 +03:00 |
|
mushka
|
3fd65e887d
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-07-06 18:13:33 +03:00 |
|
|
|
398a87fc3d
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-06 18:07:22 +03:00 |
|
|
|
27109aae4a
|
Fix Bug 57965: Added a scrollbar for the list of formats.
|
2022-07-06 18:06:32 +03:00 |
|
