Commit Graph

14977 Commits

Author SHA1 Message Date
8cc08045b7 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
2021-11-01 13:54:40 +03:00
3c7df89acf
Merge pull request #445 from ONLYOFFICE/release/1.0.0
Release/1.0.0
2021-11-01 10:47:26 +03:00
25b938d082
Merge pull request #329 from ONLYOFFICE/feature/webhooks
Feature/webhooks
2021-10-30 12:56:40 +03:00
3b7f02339b Webhooks: fix 2021-10-29 20:02:45 +03:00
4243922078 Web: Client: EditingWrapperComponent: Fixed enter press event 2021-10-29 18:33:55 +03:00
508dcb4856 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-10-29 17:41:21 +03:00
c0f0e73d2c Web: Client: EditingWrapperComponent: Fixed checking relatedTarget inside event on blur 2021-10-29 17:41:11 +03:00
1882f9db43 Fixed settings issue 2021-10-29 17:21:51 +03:00
795da675b7 fix Bug 53436 2021-10-29 16:37:51 +03:00
b15bc7b5cf WebHook: fix service 2021-10-29 13:23:37 +03:00
26511d9fb7 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Tests.sln
2021-10-29 13:18:57 +03:00
b45ba69de1
Merge pull request #443 from ONLYOFFICE/bugfix/fix-table-cells
Web: Components: Fixed table columns for new design
2021-10-29 11:13:02 +03:00
5e455bd3cc Web: Components: Fixed table columns for new design 2021-10-29 10:52:12 +03:00
3c25ee55b3 Auth: temp fix for plugin 2021-10-28 20:14:20 +03:00
73a810fb43 Elastic: fixed files query 2021-10-28 20:02:22 +03:00
8c7815d9a5
Merge pull request #427 from ONLYOFFICE/feature/sc
Feature/sc
2021-10-28 18:49:01 +03:00
40dc6a8e86 fix loading products 2021-10-28 16:07:14 +03:00
3acecdc9ad Migration: fix warnings 2021-10-28 16:04:36 +03:00
a515d3b58c
Merge pull request #440 from ONLYOFFICE/feature/media-viewer-icons
Web: Common: changed media-viewer icons, fixed media styles
2021-10-28 15:20:45 +03:00
e936725703
Merge pull request #442 from ONLYOFFICE/bugfix/51497
Fixed Bug-51497: Downloading of unsupported formats for viewing is carried out in the current tab.
2021-10-28 15:03:44 +03:00
1a404a3f0f Fixed Bug-51497: Downloading of unsupported formats for viewing is carried out in the current tab. 2021-10-28 14:57:53 +03:00
1f5fea8f81 Web: Common: fixed mediaPlayerClose cursor style 2021-10-28 14:43:20 +03:00
fe65632277 Web: Common: changed media-viewer icons, fixed media styles 2021-10-28 14:20:06 +03:00
d214b3f250
Merge pull request #439 from ONLYOFFICE/bugfix/fixed-header-arrow-click
Web: Files: fixed onBackToParentFolder
2021-10-28 14:06:15 +03:00
0d6cacb1b7 Web: Files: fixed onBackToParentFolder 2021-10-28 13:50:04 +03:00
Artem Tarasov
8c6a3f9fcd Web: Editor/Login: changed the way to save the link from sessionStorage to localStorage 2021-10-28 13:32:23 +03:00
a69df29e7d Services: fix httpContextAccessor 2021-10-28 13:23:26 +03:00
08205c2780 setup Kestrel for ApiSystem 2021-10-27 20:03:59 +03:00
0215599566 merge from develop 2021-10-27 19:37:12 +03:00
c0ea857dbf
Merge pull request #435 from ONLYOFFICE/bugfix/Bug-53050
Web: Editor/Login: fixed bug 53050: fixed redirect to editors after l…
2021-10-27 18:54:08 +03:00
90f42aecba fixed startup WebHealthChecksUI Service 2021-10-27 18:52:13 +03:00
Artem Tarasov
82e136b0e0 Web: Login: fixed remove key from session storage 2021-10-27 18:09:46 +03:00
f3a25ff330
Merge pull request #436 from ONLYOFFICE/bugfix/redirect-to-default-page-personal
Web: Client: Added redirect to default page for personal
2021-10-27 17:31:32 +03:00
f5d5e92fb8 Web: Client: Added redirect to default page for personal 2021-10-27 17:13:03 +03:00
Artem Tarasov
e42b09d025 Web: Editor/Login: fixed bug 53050: fixed redirect to editors after login when following a direct link to editors 2021-10-27 16:48:09 +03:00
3389d2035e
Merge pull request #432 from ONLYOFFICE/bugfix/Bug53344
Fix bug 53344: file selection after restore
2021-10-27 13:53:24 +03:00
7ac75bd206 fixed buildAndDeploy script 2021-10-27 13:49:19 +03:00
627642e838 fix warning 2021-10-27 12:33:39 +03:00
7ca1af82e7
Merge pull request #420 from ONLYOFFICE/feature/dbcontextmanager-optimization
Feature/dbcontextmanager optimization
2021-10-27 12:16:17 +03:00
0dbf4bca55 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53344 2021-10-27 11:17:31 +03:00
b7bf07cc92 Web: Files: fix clear selection 2021-10-27 11:16:52 +03:00
399377ff43 Merge branch 'develop' into feature/dbcontextmanager-optimization 2021-10-26 22:05:41 +03:00
dce86cb6b7
Merge pull request #434 from ONLYOFFICE/bugfix/icons-blur
Bugfix/icons blur
2021-10-26 20:46:59 +03:00
68b2108bcb Web: Common: PageLayout: Fixed padding for first row element at desktop view 2021-10-26 20:37:28 +03:00
957aa8bd81 fixed started services 2021-10-26 20:09:19 +03:00
93ab1e46ce Web: Fixed docxf icon container width 2021-10-26 19:54:19 +03:00
743325984b Web: Fixed docxf icon container width 2021-10-26 19:48:41 +03:00
78e667ebd6
Merge pull request #423 from ONLYOFFICE/feature/auto-migrations
Feature/auto migrations
2021-10-26 18:17:58 +03:00
cece18f0e7 Merge branch 'release/1.0.0' into bugfix/icons-blur 2021-10-26 16:56:35 +03:00
f5d31dcff2 Web: Files: Fixed icons blur, added new icons 2021-10-26 16:55:52 +03:00