Commit Graph

23398 Commits

Author SHA1 Message Date
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
562eb6144d SSO: fix login 2022-08-09 01:26:27 +03:00
a73b9cf2e4 Files: async fix 2022-08-08 23:03:58 +03:00
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
9ce72036ec fix 2022-08-08 18:32:46 +03:00
e6651821ce SSO: fix exist certificate 2022-08-08 13:55:38 +03:00
b252732ed2 SSO: add translate 2022-08-08 13:55:23 +03:00
Eugene Kozyrev
6b1dc19992
Feature/Rename AppServer to DocSpace in windiows installation (#752)
* Rename AppServer to DocSpace

* Rename project
2022-08-08 11:01:15 +03:00
Eugene Kozyrev
f1e2a0b145
Edit StartMigrationRunner execution sequence (#753) 2022-08-08 10:48:46 +03:00
05ab23b63a PortalSettings: fix after merge 2022-08-06 23:18:30 +03:00
28e0d02b28 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/client/src/pages/PortalSettings/index.js
2022-08-06 23:12:39 +03:00
145fc1dbfa
Merge pull request #751 from ONLYOFFICE/feature/integration-system
Feature/integration system
2022-08-05 18:56:21 +03:00
526b9ab82b Web: Client: PortalSettings: Reworked preview page 2022-08-05 18:51:25 +03:00
72ea160e18 Web: Client: PortalSettings: Fixed portal integration page header 2022-08-05 18:50:39 +03:00
d26eee0424 Async: fix webhook 2022-08-05 18:47:33 +03:00
e972d28f87 SSO: fix 2022-08-05 18:10:45 +03:00
8c234ee0aa SSO: fix forbidden image 2022-08-05 18:04:30 +03:00
65e7362ac8 Merge branch 'feature/sso' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-08-05 17:49:27 +03:00
8d7de4ee8c Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso 2022-08-05 17:32:20 +03:00