Commit graph

344 commits

Author SHA1 Message Date
Julia Radzhabova 7bea9234b5 Merge branch 'release/v7.1.0' into develop 2022-03-15 13:26:55 +03:00
SergeyEzhin 3de5972440
Merge branch 'release/v7.1.0' into feature/bug-fixes 2022-03-11 12:32:26 +04:00
Andrey Shimagin a9ae44d49a [DE PE SSE] Fix Bug 55974 2022-03-11 09:57:48 +03:00
SergeyEzhin d4d0888c23
Merge branch 'release/v7.1.0' into feature/bug-fixes 2022-03-10 12:20:01 +04:00
SergeyEzhin 027a1b3a3b [DE mobile] Fix Bug 55762 2022-03-10 00:32:42 +04:00
SergeyEzhin 77dbb42e72 [DE PE SSE mobile] Fix Bug 53256 2022-03-06 02:36:26 +04:00
SergeyEzhin 66f544bfe1 [SSE mobile] Fix Bug 52861 2022-03-05 18:51:03 +04:00
Julia Radzhabova b1a58e9f61 Merge branch 'release/v7.1.0' into develop 2022-03-05 13:05:49 +03:00
maxkadushkin d2c5b7ff1d
Merge pull request #1611 from ONLYOFFICE/feature/fix-bug-react
Feature/fix bug react
2022-03-03 23:46:20 +03:00
ShimaginAndrey 3aff08333f [DE PE SSE] Fix Bug 55865 2022-03-03 17:11:15 +03:00
ShimaginAndrey cc60ecdd54 Fix regSettings and refactoring 2022-03-02 13:09:22 +03:00
Julia Radzhabova 0aff146ac0 Fix Bug 55816 2022-03-01 17:17:02 +03:00
maxkadushkin 5bc18dce53
Merge pull request #1584 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2022-02-25 10:08:47 +03:00
ShimaginAndrey 876ac7670d [SSE] Fix Bug 55656 2022-02-22 14:34:41 +03:00
SergeyEzhin 383c95fc22 [DE mobile] Fix Bug 55049 2022-02-18 17:11:14 +04:00
maxkadushkin 12b634323b
Merge pull request #1573 from ONLYOFFICE/feature/fix-bug-react
Feature/fix bug react
2022-02-17 10:25:02 +03:00
SergeyEzhin 534392b9c2 [DE mobile] Some edits toc 2022-02-16 17:54:28 +04:00
ShimaginAndrey 4549f3556b [DE PE SSE] Fix Bug 55534 2022-02-16 13:37:54 +03:00
maxkadushkin f65ac90534
Merge pull request #1570 from ONLYOFFICE/feature/bug-commit-move
Feature/bug commit move
2022-02-16 13:22:32 +03:00
ShimaginAndrey 2d0e40d9c5 [DE PE SSE] Fix Bug 54511
# Conflicts:
#	apps/common/mobile/resources/less/about.less
#	apps/common/mobile/resources/less/common.less
2022-02-14 15:12:22 +03:00
ShimaginAndrey 8762bbb0ba [DE PE] Fix Bug 55447 2022-02-10 17:20:16 +03:00
ShimaginAndrey 8c35514ced [SSE] Fix Bug 55357 2022-02-07 13:06:41 +03:00
ShimaginAndrey b6b95345c8 [DE PE SSE] Fix Bug 55355 2022-02-04 18:23:50 +03:00
ShimaginAndrey ab17a7161a [DE] Fix Bug 55111 2022-01-27 17:17:09 +03:00
ShimaginAndrey b70f1fc3ef [SSE] Fix Bug 54969 2022-01-25 12:37:36 +03:00
SergeyEzhin c767b218ef [DE PE SSE mobile] Correct formats icons 2022-01-14 16:22:06 +04:00
ShimaginAndrey d47fb111df Merge branch 'develop' into feature/fix-bug-reactjs
# Conflicts:
#	apps/common/mobile/resources/less/about.less
#	apps/common/mobile/resources/less/common.less
2021-12-24 18:53:13 +03:00
Julia Radzhabova 89a66ab06a Merge branch 'release/v7.0.0' into develop 2021-12-24 17:32:14 +03:00
ShimaginAndrey b2a718a974 [DE PE SSE] Fix Bug 54511 2021-12-21 12:02:49 +03:00
Maxim Kadushkin e14be4baec Merge branch 'hotfix/v6.4.3' into release/v7.0.0 2021-12-21 00:06:03 +03:00
Maxim Kadushkin 2c70526032 [PE] for bug 53999 2021-12-20 18:19:40 +03:00
ShimaginAndrey c2735e8606 [DE PE SSE] Fix Bug 54511 2021-12-14 14:20:12 +03:00
SergeyEzhin 46099dc36f Fix Bug 53671 2021-12-12 18:35:05 +03:00
Julia Radzhabova 3f2597d5cd Merge branch 'release/v7.0.0' into develop 2021-12-10 19:01:46 +03:00
SergeyEzhin b43516d807 [DE mobile] Fix Bug 54281 2021-12-09 19:23:20 +04:00
Julia Radzhabova 86f10c9133 Merge branch 'release/v7.0.0' into develop 2021-12-07 18:49:59 +03:00
SergeyEzhin 2f9b24887a Fix Bug 53671 2021-12-03 14:52:07 +04:00
ShimaginAndrey a0672fbe61 [SSE] Replacing alert on dialog window 2021-11-28 20:37:18 +03:00
ShimaginAndrey 70cf0f2578 [PE] Fix Bug 53999 v2 2021-11-25 18:02:51 +03:00
ShimaginAndrey cea7c6c694 [PE] Fix Bug 53999 2021-11-24 14:18:02 +03:00
SergeyEzhin e3746cabf0 Merge and resolve conflicts 2021-11-22 17:08:18 +04:00
ShimaginAndrey 4bd582fc0d Correct and add styles v3 2021-11-21 17:50:37 +03:00
SergeyEzhin 94f3f4631d Edit and add styles v.5 2021-11-19 23:33:38 +04:00
ShimaginAndrey 739cf52862 [DE] Added Themes controller and correct styles 2021-11-19 16:00:00 +03:00
SergeyEzhin 373bca6c00 After merge 2021-11-19 01:12:48 +04:00
SergeyEzhin 66840d642d Edit and add styles v.4 2021-11-19 01:09:53 +04:00
ShimaginAndrey 581b7f690f Correct and add styles v2 2021-11-18 17:45:51 +03:00
Maxim Kadushkin 66d3071f7a [PE mobile] changed some icons to correct image-mask 2021-11-18 15:23:33 +03:00
Maxim Kadushkin c83d0f548a [DE mobile] changed some icons to support ui themes 2021-11-18 13:28:51 +03:00
SergeyEzhin 8ed2d0d652 Edit and add styles v.3 2021-11-18 01:58:22 +04:00