|
|
4feba8a356
|
Merge branch 'develop' into feature/inifinite-scroll
|
2022-08-12 13:08:12 +03:00 |
|
|
|
28c73a4a7c
|
Web: Components: moved to react-virtualized, fixed blue screen
|
2022-08-12 10:35:32 +03:00 |
|
|
|
eea2c0c656
|
Components: FormWrapper: fix min-width
|
2022-08-11 17:43:30 +03:00 |
|
|
|
6316de2937
|
Components: FormWrapper: fix width
|
2022-08-11 17:17:21 +03:00 |
|
TimofeyBoyko
|
ecf3da4668
|
Web:Components:DropDownItem: add available display icon as link
|
2022-08-11 16:14:14 +03:00 |
|
|
|
8c3bc03f6d
|
Components: FormWrapper: fix width
|
2022-08-11 15:22:30 +03:00 |
|
TimofeyBoyko
|
d6f1f99d02
|
Web:Components:ContextMenu: add available show item icon from relative path
|
2022-08-10 16:21:00 +03:00 |
|
|
|
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 |
|
|
|
492ed86674
|
Web: Files: fixed double scroll
|
2022-08-10 13:32:17 +03:00 |
|
|
|
8f4ee05948
|
Web: Files: fixed mobile scroll
|
2022-08-10 13:27:52 +03:00 |
|
|
|
2c2251d33e
|
Web: Files: added default useReactWindow prop
|
2022-08-10 11:37:14 +03:00 |
|
|
|
2e06c8fd58
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/sso
# Conflicts:
# build/install/win/DocSpace.aip
|
2022-08-10 09:57:03 +03:00 |
|
mushka
|
8f5f597c5f
|
Merge branch 'develop' into feature/create-room
|
2022-08-09 19:12:47 +03:00 |
|
mushka
|
67cedcd06e
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-08-09 19:08:11 +03:00 |
|
|
|
deffed2d14
|
Web: Files: fixed scroll for mobile devices
|
2022-08-09 16:19:52 +03:00 |
|
|
|
0de5d36ce4
|
Web: Files: Scroll: added WindowScroller
|
2022-08-09 13:43:24 +03:00 |
|
TimofeyBoyko
|
c680c90580
|
Web:Components:add support dark-theme for tag component
|
2022-08-09 11:15:01 +03:00 |
|
TimofeyBoyko
|
012d347ca2
|
Web:Client: fix column width after switching from files to rooms
|
2022-08-09 10:57:30 +03:00 |
|
|
|
d0e4f67ec4
|
Merge branch 'develop' into feature/inifinite-scroll
# Conflicts:
# packages/client/src/components/Article/Body/index.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
# packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/InfiniteGrid.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/StyledInfiniteGrid.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
# packages/client/src/store/FilesStore.js
|
2022-08-09 09:49:28 +03:00 |
|
Artem Tarasov
|
a520446d69
|
Web: Packages: localStorage usage changed to cookies when saving language
|
2022-08-05 17:21:14 +03:00 |
|
|
|
077daa7d1d
|
Components: Themes: fix
|
2022-08-05 03:26:28 +03:00 |
|
|
|
c7b0b4addd
|
Components: HelpButton: fix size
|
2022-08-05 03:07:29 +03:00 |
|
|
|
bf90c710be
|
Components: Submenu: fix style
|
2022-08-05 02:54:39 +03:00 |
|
|
|
acbcd337f6
|
Components: InputBlock: fix icon
|
2022-08-05 00:58:50 +03:00 |
|
mushka
|
5cd4263b38
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-04 15:21:06 +03:00 |
|
mushka
|
1e10e329d9
|
added ability to pass props directly to tooltip through help-button
|
2022-08-03 14:28:00 +03:00 |
|
mushka
|
ea8aa736c4
|
merge with develop
|
2022-08-02 14:11:41 +03:00 |
|
mushka
|
a418d7d42d
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-08-02 12:18:06 +03:00 |
|
|
|
03b03ed910
|
Merge branch 'develop' into feature/sso
# Conflicts:
# packages/client/public/images/actions.upload.react.svg
# packages/client/public/images/empty_screen_privacy.png
# packages/client/public/locales/en/SingleSignOn.json
# packages/client/public/locales/ru/SingleSignOn.json
# packages/client/src/helpers/constants.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerItem.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerModalDialog.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerToggle.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/modalDialogContainer.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js
# packages/client/src/pages/PortalSettings/categories/integration/thirdPartyServicesSettings.js
# packages/client/src/store/SsoFormStore.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
|
2022-08-02 12:05:15 +03:00 |
|
|
|
d093c97b97
|
Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes)
|
2022-08-01 15:37:33 +03:00 |
|
|
|
280f702cf9
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/components/NavMenu/index.js
# packages/client/src/store/ProfileActionsStore.js
# yarn.lock
|
2022-07-25 21:29:04 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
