|
|
e54617c275
|
Files: fix
|
2022-08-11 16:37:18 +03:00 |
|
|
|
f4caa90745
|
Confirm: fix style
|
2022-08-11 16:36:17 +03:00 |
|
|
|
1f035e9556
|
Confirm: fix style
|
2022-08-11 16:30:11 +03:00 |
|
|
|
6a386f9be0
|
Confirm: fix style
|
2022-08-11 15:22:44 +03:00 |
|
|
|
8c3bc03f6d
|
Components: FormWrapper: fix width
|
2022-08-11 15:22:30 +03:00 |
|
|
|
18863258a0
|
Confirm: fix style
|
2022-08-11 14:53:43 +03:00 |
|
|
|
0ad8be0d1a
|
Files: fix
|
2022-08-11 14:30:01 +03:00 |
|
|
|
c0bf10af9e
|
Files: fix
|
2022-08-10 22:27:44 +03:00 |
|
|
|
a63ee39d36
|
Files: removed unused method
|
2022-08-10 21:23:46 +03:00 |
|
|
|
69e5665763
|
Files: async fix
|
2022-08-10 19:45:59 +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 |
|
|
|
779c726e6d
|
Merge pull request #730 from ONLYOFFICE/feature/sso
Feature/sso
|
2022-08-10 16:00:35 +03:00 |
|
|
|
48d8e16d49
|
Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso
|
2022-08-10 15:33:13 +03:00 |
|
|
|
97aee7f8c2
|
SSO: fix login
|
2022-08-10 15:33:02 +03:00 |
|
|
|
1c07363c48
|
SSO: fix edit
|
2022-08-10 15:30:41 +03:00 |
|
|
|
d0ea9b4d7e
|
SSO: fix clear data
|
2022-08-10 13:47:45 +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 |
|
|
|
966e1e293e
|
Web: Files: fixed hotkeys
|
2022-08-10 11:38:04 +03:00 |
|
|
|
2c2251d33e
|
Web: Files: added default useReactWindow prop
|
2022-08-10 11:37:14 +03:00 |
|
|
|
08c41f5121
|
Web: Files: FormGallery: removed useless code
|
2022-08-10 11:28:57 +03:00 |
|
|
|
c0066f7eea
|
fix gitignore merge
|
2022-08-10 10:00:10 +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 |
|
|
|
39c7a8ac2c
|
Files: fix
|
2022-08-09 23:23:36 +03:00 |
|
|
|
ea2f03331b
|
refactoring
|
2022-08-09 19:13:07 +03:00 |
|
|
|
abe3f73cb6
|
SSO: auto set checkboxes
|
2022-08-09 18:36:35 +03:00 |
|
|
|
75a7553397
|
SSO: fix delete
|
2022-08-09 18:28:57 +03:00 |
|
|
|
83e7ad25d2
|
SSO: fixed successful login
|
2022-08-09 17:14:35 +03:00 |
|
|
|
05d5421ebc
|
fix
|
2022-08-09 17:11:40 +03:00 |
|
|
|
3dd880be41
|
Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso
|
2022-08-09 16:53:53 +03:00 |
|
|
|
bfe43ebe96
|
SSO: fix login
|
2022-08-09 16:53:22 +03:00 |
|
|
|
baaec9dcef
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# common/ASC.Socket.IO/.yarn/install-state.gz
# common/ASC.SsoAuth/.yarn/install-state.gz
# common/ASC.UrlShortener/.yarn/install-state.gz
# common/ASC.WebDav/.yarn/install-state.gz
|
2022-08-09 16:27:35 +03:00 |
|
|
|
deffed2d14
|
Web: Files: fixed scroll for mobile devices
|
2022-08-09 16:19:52 +03:00 |
|
|
|
d679a3d9a7
|
Files: async fix
|
2022-08-09 16:09:14 +03:00 |
|
Sergey Kirichenko
|
09be9c3907
|
Modify rabbit, redis docker running (#754)
* Modify rabbit, redis run
* Modify
STORAGE_ROOT
* Syntax modify
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
|
2022-08-09 15:57:34 +03:00 |
|
|
|
b1d70eaeb0
|
Web: Files: fixed Tile styles
|
2022-08-09 14:13:42 +03:00 |
|
|
|
0de5d36ce4
|
Web: Files: Scroll: added WindowScroller
|
2022-08-09 13:43:24 +03:00 |
|
|
|
717b1f899a
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2022-08-09 12:51:40 +03:00 |
|
|
|
6db28a8a86
|
warm up service: added logs
|
2022-08-09 12:51:32 +03:00 |
|
|
|
193c86c5a1
|
Merge pull request #755 from ONLYOFFICE/bugfix/room-list
Bugfix/room list
|
2022-08-09 12:02:41 +03:00 |
|
|
|
672a20fa7e
|
Merge branch 'develop' into bugfix/room-list
|
2022-08-09 11:56:20 +03:00 |
|
|
|
1313014659
|
Merge branch 'feature/sso' of github.com:ONLYOFFICE/AppServer into feature/sso
|
2022-08-09 11:46:13 +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 |
|
|
|
a57d81ca4d
|
Merge branch 'develop' into feature/inifinite-scroll
|
2022-08-09 10:37:47 +03:00 |
|
|
|
5f69b6bc0c
|
warm up services
|
2022-08-09 10:28:44 +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 |
|
|
|
f496771391
|
warm up services
|
2022-08-09 09:49:05 +03:00 |
|
|
|
8ffffd72b5
|
Merge branch 'feature/inifinite-scroll' of github.com:ONLYOFFICE/AppServer into feature/inifinite-scroll
|
2022-08-09 09:31:35 +03:00 |
|
|
|
588bb2f9d4
|
Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso
|
2022-08-09 01:26:50 +03:00 |
|
