Commit graph

779 commits

Author SHA1 Message Date
maxkadushkin adefe3f056
Merge pull request #1287 from ONLYOFFICE/feature/merge-hotfix-642-to-develop
Feature/merge hotfix 642 to develop
2021-10-31 22:34:58 +03:00
Maxim Kadushkin 27d024bde5 Merge branch 'hotfix/v6.4.2' into release/v7.0.0 2021-10-31 22:26:35 +03:00
Maxim Kadushkin a69f22b9b4 Merge branch 'hotfix/v6.4.2' into develop 2021-10-31 22:23:43 +03:00
Julia Radzhabova 67b8c6bccd Merge branch 'release/v7.0.0' into develop 2021-10-31 01:40:47 +03:00
ShimaginAndrey 962548467f [DE PE SSE] Edit SearchBar 2021-10-28 11:31:21 +03:00
SergeyEzhin 16bc4c07e7 [DE PE SSE mobile] Correct blocking keyboard 2021-10-26 21:13:58 +04:00
SergeyEzhin c5e8d84172 [DE PE SSE mobile] Blocking keyboard 2021-10-25 20:45:08 +04:00
maxkadushkin 79ba2a5b7b
Merge pull request #1252 from ONLYOFFICE/feature/fix-bug-reactjs
Feature/fix bug reactjs
2021-10-25 11:19:50 +03:00
Maxim Kadushkin 116b4e15ab [mobile] fix bug 53325 2021-10-24 13:25:10 +03:00
Maxim Kadushkin 15fb1e9dda [mobile] remove wrong chars in "about" 2021-10-23 16:14:30 +03:00
Maxim Kadushkin ec46276bea [mobile] for bug 53253 2021-10-22 23:03:03 +03:00
SergeyEzhin 346ee09460 [SSE mobile] Correct protection 2021-10-22 15:11:14 +04:00
SergeyEzhin bdac3a4521 [SSE mobile] Add protection in comments v.2 2021-10-21 23:45:19 +04:00
ShimaginAndrey 58a6d1da3a [DE PE SSE] Fix Bug 51892 2021-10-21 11:33:56 +03:00
SergeyEzhin 6044b95c2f [SSE mobile] Add protection in comments 2021-10-20 21:28:00 +04:00
Maxim Kadushkin c435ab3290 [all] debug for app customization config 2021-10-19 23:51:59 +03:00
Julia Radzhabova 0e2ca89b9c Merge branch 'release/v7.0.0' into develop 2021-10-19 18:24:19 +03:00
ShimaginAndrey ce89046d67 [SSE] Fix Bug 53074 2021-10-19 14:05:12 +03:00
Julia Radzhabova c9dc1ee030 [SSE mobile] Fix Bug 53188 2021-10-19 13:32:23 +03:00
SergeyEzhin cd592d564b [common] Fix Bug 53181 2021-10-16 18:55:25 +04:00
SergeyEzhin c45fcb0ca5 [common] Correct searchbar v.2 2021-10-16 02:13:31 +04:00
SergeyEzhin d899bcabbf [common] Correct searchbar 2021-10-15 15:22:07 +04:00
ShimaginAndrey 30fd37cd24 [DE PE SSE] Fix Bug 53128 2021-10-14 12:53:14 +03:00
maxkadushkin 8da1200ea1
Merge pull request #1229 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2021-10-06 14:26:52 +03:00
maxkadushkin 0bd401884e
Merge pull request #1230 from ONLYOFFICE/feature/skeleton-optimize
Feature/skeleton optimize
2021-10-06 14:25:22 +03:00
Maxim Kadushkin 8f6c1d3fc5 [all] fixed navbar stylesheet 2021-10-05 22:31:55 +03:00
ShimaginAndrey 7ae7a08e7f Fix Bug 52870 2021-10-04 15:59:28 +03:00
SergeyEzhin 96f81d6c6d [SSE mobile] Fix Bug 52861 2021-10-04 13:39:00 +04:00
ShimaginAndrey ba27f4d38a Fix Bug 52824 2021-09-29 11:43:42 +03:00
Maxim Kadushkin 24024fac8f [SSE modile] refactoring 2021-09-28 11:09:07 +03:00
Maxim Kadushkin 83654a29d6 [SSE mobile] adapt start markup for ios devices 2021-09-28 10:53:40 +03:00
Maxim Kadushkin 594db69572 [SSE mobile] inline skeleton styles to html 2021-09-27 22:01:49 +03:00
Maxim Kadushkin 858c7a3ad4 [PE mobile] skip using "Suspense" option for app's launch 2021-09-23 23:45:10 +03:00
Maxim Kadushkin f5674d8b9c [DE mobile] refactoring 2021-09-23 12:20:26 +03:00
Maxim Kadushkin 9472f77ef0 [mobile] refactoring 2021-09-23 12:19:24 +03:00
Julia Radzhabova 84c0740762 Merge branch 'release/v6.5.0' into develop 2021-09-22 23:52:09 +03:00
SergeyEzhin 03533acc56 [DE PE mobile] Correct highlight color palette and edit settings 2021-09-17 15:20:26 +03:00
SergeyEzhin ad11eec233 [PE mobile] Added highlight color palette 2021-09-17 15:20:26 +03:00
SergeyEzhin 4dccf5a7dd Correct highlight color palette 2021-09-17 15:20:26 +03:00
SergeyEzhin d92e4f23df Make highlight color palette v.2 2021-09-17 15:20:26 +03:00
SergeyEzhin 50ce0cd359 Make highlight color palette 2021-09-17 15:20:26 +03:00
SergeyEzhin e4c58e80bd Make highlight color palette 2021-09-17 15:20:26 +03:00
maxkadushkin ad52136ece
Merge pull request #1167 from ONLYOFFICE/feature/Bug_52141
Feature/bug 52141
2021-09-10 01:09:15 +03:00
SergeyEzhin 10d8baac50 [SSE mobile] Correct styles 2021-09-09 19:03:15 +03:00
SergeyEzhin 0c718872a7 [SSE mobile] Corrected functions list 2021-09-08 20:11:47 +03:00
maxkadushkin 0c96e16e6a
Merge pull request #1161 from ONLYOFFICE/feature/fix-bug-reactjs
Feature/fix bug reactjs
2021-09-08 12:31:44 +03:00
SergeyEzhin f1421ac2ed [SSE mobile] Make tablet version 2021-09-06 21:55:10 +03:00
JuliaSvinareva 88a53de319 [mobile] Fix bug 47774 2021-09-06 19:28:09 +03:00
maxkadushkin b46d0aef2b
Merge pull request #1155 from ONLYOFFICE/feature/Bug_52141
[SSE mobile] Added function info
2021-09-03 17:37:56 +03:00
ShimaginAndrey ce7791ea19 [DE PE SSE] Fix Bug 52362 2021-09-03 16:20:39 +03:00
SergeyEzhin a7311327f8 [SSE mobile] Added function info 2021-09-01 19:22:51 +03:00
maxkadushkin 3fbd41e9f7
Merge pull request #1141 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2021-08-31 18:39:12 +03:00
Julia Radzhabova c997bc62c8 [Mobile] Use plugin.deserialize 2021-08-30 23:44:46 +03:00
SergeyEzhin c12e2d1525 [DE PE mobile] Fix Bug 51538 2021-08-30 18:29:44 +03:00
maxkadushkin c6423dd844
Merge pull request #1136 from ONLYOFFICE/feature/Bug_52141
[SSE mobile] Added functions list
2021-08-30 11:50:30 +03:00
SergeyEzhin 78cdc5f873 [SSE mobile] Added functions list 2021-08-27 16:16:28 +03:00
ShimaginAndrey c06fc3b034 Fix Bug 47724 2021-08-27 16:14:58 +03:00
SergeyEzhin 683b635d5e Merge branch 'develop' into feature/Bug_47900 2021-08-25 22:01:18 +03:00
Julia Radzhabova a207366b14 Fix merge release to develop 2021-08-25 20:51:35 +03:00
Maxim Kadushkin 5a7421e35d merge release 6.4.0 to develop 2021-08-25 19:02:44 +03:00
maxkadushkin 7f7e344ed4
Merge pull request #1111 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2021-08-23 15:09:23 +03:00
SergeyEzhin 0550275944 [DE PE SSE mobile] Fix Bug 52098 2021-08-23 13:47:41 +03:00
maxkadushkin 2d08d12cd8
Merge pull request #1104 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2021-08-20 17:27:25 +03:00
SergeyEzhin 2a0ae0db20 [DE PE SSE mobile] Fix Bug 51458 2021-08-20 12:29:31 +03:00
JuliaSvinareva 352c381869 [SSE mobile] Fix bug 49025 2021-08-18 11:26:10 +03:00
Julia Radzhabova fb484c0965
Merge pull request #1088 from ONLYOFFICE/feature/bug-fixes
[PE mobile] Fix Bug 51994
2021-08-17 17:57:16 +03:00
SergeyEzhin d9622b84eb [PE mobile] Fix Bug 51994 2021-08-17 17:32:38 +03:00
Julia Radzhabova 6d67430e62
Merge pull request #1076 from ONLYOFFICE/feature/fix-bug-reactjs
Feature/fix bug reactjs
2021-08-13 21:43:41 +03:00
Julia Radzhabova 43491e0115
Merge pull request #1075 from ONLYOFFICE/feature/de-review
Feature/de review
2021-08-13 20:28:10 +03:00
ShimaginAndrey 238512f1ed [PE SSE] Fix Bug 51892 2021-08-12 16:01:51 +03:00
JuliaSvinareva 03438fd144 [mobile] Fix bug 51874 2021-08-10 19:38:55 +03:00
Julia Radzhabova a9c32f368e [DE] Use new methods for review display 2021-08-10 19:32:12 +03:00
SergeyEzhin 8fdb2109fe [DE mobile] Fix Bug 47900 2021-08-10 18:00:50 +03:00
Julia Radzhabova 4900bdc57b
Merge pull request #1056 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2021-08-09 17:59:39 +03:00
SergeyEzhin 179aad0d22 Removed timeout 2021-08-09 17:15:28 +03:00
SergeyEzhin 5a376cc3eb [DE mobile] Fix Bug 49157 2021-08-09 16:32:28 +03:00
Julia Radzhabova 3ab6e18621 Merge branch 'release/v6.4.0' into develop 2021-08-09 13:30:40 +03:00
JuliaSvinareva d1c9c8525d [mobile] Fix search 2021-08-06 20:09:38 +03:00
SergeyEzhin c532f574c7 [DE PE mobile] Fix Bug 51538 2021-08-05 17:56:34 +03:00
Julia Radzhabova 7211050c0d
Merge pull request #1046 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2021-08-04 17:53:25 +03:00
JuliaSvinareva 0d25adcc5c [mobile] Fix bug 51687 2021-08-04 14:59:46 +03:00
Julia Radzhabova 7dfb96f914 [DE] Add simple markup mode for display review changes 2021-08-04 13:19:19 +03:00
JuliaSvinareva cb10778723 [mobile] Fix bug 51680 2021-08-03 21:20:32 +03:00
SergeyEzhin 9b31aee15b [DE mobile] Fix Bug 51670 2021-08-03 18:14:45 +03:00
SergeyEzhin 69cf357661 [SSE mobile] Correct statusbar 2021-07-28 18:19:46 +03:00
Julia Radzhabova d767fa5399 Merge branch 'release/v6.4.0' into develop 2021-07-28 00:03:49 +03:00
Julia Radzhabova d70ad97b2d [DE mobile] Fix track changes 2021-07-23 00:38:36 +03:00
Julia Radzhabova 4e3d968f26 Refactoring 2021-07-22 23:59:21 +03:00
Julia Radzhabova be8bc7dd42 Move api parameters showReviewChanges, reviewDisplay, trackChanges to section customization.review 2021-07-22 22:56:15 +03:00
maxkadushkin f06ee2f5db
Merge pull request #1001 from ONLYOFFICE/feature/fix-bug-reactjs
Feature/fix bug reactjs
2021-07-22 22:32:53 +03:00
Julia Radzhabova f13673653f Merge branch 'release/v6.4.0' into develop 2021-07-22 17:44:51 +03:00
maxkadushkin 4c67f91240
Merge pull request #998 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2021-07-21 11:27:14 +03:00
SergeyEzhin 24f74aa199 Fix Bug 51402 2021-07-20 18:30:21 +03:00
ShimaginAndrey 947dc9635a Fix set_MinVersion 2021-07-20 15:25:23 +03:00
maxkadushkin e949655e8e
Update about.less 2021-07-20 00:11:44 +03:00
Maxim Kadushkin f864b6d719 [all mobile] fixed logo 2021-07-19 23:06:36 +03:00
maxkadushkin c934dd3640
Merge branch 'release/v6.4.0' into feature/bug-fixes 2021-07-19 17:24:31 +03:00
ShimaginAndrey dcca2e189e Fix Bug 50903 2021-07-19 16:26:51 +03:00
Julia Radzhabova 656715a52b Merge branch 'release/v6.4.0' into develop 2021-07-19 14:37:16 +03:00
SergeyEzhin a5a70b05d0 Fix Bug 51169 2021-07-17 16:54:49 +03:00
ShimaginAndrey da7a34a4ef Set MinVersion plugin 2021-07-14 21:11:18 +03:00
JuliaSvinareva 5f2b4ad4a1 [mobile] Fix bug 51268 2021-07-13 15:50:55 +03:00
Julia Radzhabova 60f2c149e3
Merge pull request #967 from ONLYOFFICE/feature/access-to-comments
Feature/access to comments
2021-07-12 19:26:59 +03:00
ShimaginAndrey ba8133a29b [DE PE SSE] Adding parser-plugins 2021-07-12 18:41:43 +03:00
maxkadushkin cd9ff4a918
Merge pull request #974 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2021-07-12 16:48:33 +03:00
SergeyEzhin 662ee6d9a5 [DE PE SSE mobile] Fix Bug 51134 2021-07-09 19:04:06 +03:00
JuliaSvinareva f54d007f31 [mobile] Fix bug 51161 2021-07-09 14:44:11 +03:00
SergeyEzhin 1086ba8fba Clear console log 2021-07-08 21:20:11 +03:00
SergeyEzhin 6d818e120a [DE PE SSE mobile] Bug 51134 2021-07-08 21:18:15 +03:00
ShimaginAndrey 278b3dd3cf editing styles icon 2021-07-08 17:21:29 +03:00
ShimaginAndrey 1e0f45842d Save settings resolvedcomment 2021-07-08 09:59:37 +03:00
ShimaginAndrey ce9c49beaf [DE PE SSE] Fix resolved and sort comments 2021-07-07 18:31:44 +03:00
ShimaginAndrey 58e8be1904 Fixed icon display 2021-07-07 12:24:38 +03:00
ShimaginAndrey 1486c12cd4 [DE PE SSE]Setting rights for comments 2021-07-06 17:13:55 +03:00
JuliaSvinareva a39655f0e8 [mobile] Fix bug 51099 2021-07-05 23:01:51 +03:00
JuliaSvinareva dc77b19ec2 [mobile] Fix bugs 51080, 51081, 50867 2021-07-05 22:12:50 +03:00
Maxim Kadushkin 322f8930ec [all] removed unused code 2021-07-05 00:36:43 +03:00
JuliaSvinareva 6e475b9e90 [mobile] Fix context menu 2021-07-02 19:20:59 +03:00
JuliaSvinareva b154777f5a [mobile] Fix user name in comments (2) 2021-07-02 17:49:53 +03:00
JuliaSvinareva 12c0492c90 [mobile] Fix user name in comments 2021-07-02 15:48:50 +03:00
Julia Radzhabova 64b8e12ff6 [Mobile] Fix user name in comments 2021-07-02 14:27:16 +03:00
ShimaginAndrey 496f5b89f6 Correct users store 2021-07-01 19:21:10 +03:00
ShimaginAndrey af2d105790 Refactoring code v2 2021-07-01 19:06:03 +03:00
ShimaginAndrey c1c73e74a1 Refactoring code 2021-07-01 18:51:03 +03:00
ShimaginAndrey a2172f924d Common.Utils.UserInfoParser -> AscCommon.UserInfoParser 2021-07-01 12:52:01 +03:00
Maxim Kadushkin bae484e6a4 Merge branch 'feature/load-external-themes' into develop 2021-06-28 23:51:38 +03:00
maxkadushkin 8562f46186
Merge pull request #950 from ONLYOFFICE/feature/Bug_47151
Feature/bug 47151
2021-06-28 19:08:31 +03:00
maxkadushkin 2839960906
Merge pull request #948 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2021-06-28 15:54:13 +03:00
SergeyEzhin 7117a546c0 [DE SSE mobile] Fix Bug 47858 2021-06-28 14:40:46 +03:00
ShimaginAndrey 742af60274 Correct icon android 2021-06-28 14:16:41 +03:00
maxkadushkin 4e2962174b
Merge branch 'release/v6.4.0' into feature/fix-bug-reactjs 2021-06-23 16:19:29 +03:00
SergeyEzhin 698d85360a [PE mobile] Fix Bug 50847 2021-06-21 16:05:01 +03:00
maxkadushkin 71e1dd4669
Merge pull request #931 from ONLYOFFICE/fix/fix-bugs-on-mobiles
Fix/fix bugs on mobiles
2021-06-18 21:13:12 +03:00
JuliaSvinareva 5a6dfc5e8e [mobile] Fix bug 50878 2021-06-18 20:49:51 +03:00
ShimaginAndrey f1b4663ec4 [DE PE SSE mobile] Fix Bug 50903 2021-06-18 18:07:15 +03:00
maxkadushkin 0c95c2ec2b
Merge pull request #929 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2021-06-18 17:03:08 +03:00
SergeyEzhin 055fbeb062 [SSE mobile] Fix Bug 50800 2021-06-18 12:43:41 +03:00
SergeyEzhin 582b29cabf [common] Fix Bug 48242 2021-06-17 21:38:09 +03:00
ShimaginAndrey 005bb841dc Fix Bug 50832 2021-06-17 18:58:45 +03:00
JuliaSvinareva bbbfb5ddde [mobile] Fix plugins 2021-06-17 18:24:31 +03:00
ShimaginAndrey d2c7b5dfe8 Fix Bug 50802 2021-06-15 16:12:16 +03:00
ShimaginAndrey b42b14903f Add multilevel list presentation 2021-06-10 15:28:21 +03:00
Maxim Kadushkin 8d953f5dbb [themes] redactoring for mobile 2021-06-10 15:14:35 +03:00
maxkadushkin a707da477c
Merge pull request #919 from ONLYOFFICE/feature/release-fixes
Feature/release fixes
2021-06-09 19:20:29 +03:00
ShimaginAndrey 4c3323f12e Style editing and selector 2021-06-09 17:26:36 +03:00
JuliaSvinareva 5c63e5cb0e [common] Fix bug 48484 2021-06-09 17:17:42 +03:00
JuliaSvinareva e2e68d25b5 [mobile] Fix bug 50797 2021-06-09 15:18:04 +03:00
SergeyEzhin 7657c036cd [common] Correct styles for icons 2021-06-08 18:21:59 +03:00
SergeyEzhin 55de02cb15 [common] Fig Bug 48484 2021-06-08 16:59:11 +03:00
ShimaginAndrey 15160e4f95 Edit list styles 2021-06-08 15:20:50 +03:00
SergeyEzhin 47a4436d06 [DE PE SSE mobile] Correct application settings and comments 2021-06-07 19:54:19 +03:00
ShimaginAndrey d57cfedc77 addition to the lists 2021-06-07 18:06:55 +03:00
SergeyEzhin f5ca014da5 [DE PE SSE mobile] Bug 49112 2021-06-03 16:25:52 +03:00
SergeyEzhin c2d5da8395 [common] Bug 48484 2021-06-03 00:31:39 +03:00
ShimaginAndrey 8170df1e9e Create multi-level list 2021-06-02 18:33:27 +03:00
SergeyEzhin 27dc6495a4 [PE mobile] Bug 47978 2021-05-31 18:08:02 +03:00
JuliaSvinareva 4f5c9dac5f Merge branch 'feature/fix-bug-on-reactjs' into develop 2021-05-31 17:07:52 +03:00
JuliaSvinareva 3382d2f373 Merge branch 'feature/develop-fixes' into develop 2021-05-31 16:29:18 +03:00
SergeyEzhin e9eb6fceda [DE PE SSE mobile] Corrected buttons 2021-05-30 16:34:15 +03:00
SergeyEzhin 8461050b39 Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 2021-05-28 19:39:27 +03:00
SergeyEzhin 7d92eb8140 Correct table styles 2021-05-28 19:39:08 +03:00
Maxim Kadushkin d3854c0571 [all] added colors table 2021-05-28 17:07:19 +03:00
SergeyEzhin c254f2c93a Corrected replace all 2021-05-27 15:41:15 +03:00
JuliaSvinareva 5c51353d23 Merge branch 'feature/develop-fixes' into develop 2021-05-27 12:58:19 +03:00
ShimaginAndrey c51221e46e Fix Bug 48186 addition 2021-05-26 20:25:04 +03:00
ShimaginAndrey 3c05927fbc Fix Bug 48186 2021-05-26 14:45:05 +03:00
JuliaSvinareva 059b843649 [mobile] Fix styles 2021-05-25 18:22:34 +03:00
JuliaSvinareva 642f72f182 Merge branch 'feature/fix-bug-shimaginA' into develop 2021-05-25 18:01:22 +03:00
SergeyEzhin b5906be128 [PE mobile] Bug 43838 2021-05-25 17:11:24 +03:00
ShimaginAndrey 7e74d486f6 Fix Bug 47237 modification v4 2021-05-25 16:46:24 +03:00
ShimaginAndrey 1850ecfdca Fix Bug 47237 modification v3 2021-05-25 12:07:02 +03:00
ShimaginAndrey 14220fe977 Fix Bug 47237 modification v2 2021-05-24 16:41:31 +03:00
ShimaginAndrey 4355f29cfc Merge branch 'feature/mobile-apps-on-reactjs' into feature/fix-bug-shimaginA
# Conflicts:
#	build/package.json
2021-05-24 10:58:40 +03:00
ShimaginAndrey 10927e6f63 Filter Options 2021-05-23 18:27:21 +03:00
Julia Radzhabova f7ad092d81 Change comment groups: show comment replys from all users group if comment is visible for current user group 2021-05-18 15:18:58 +03:00
JuliaSvinareva bae254340f [mobile] Change touch color for android 2021-05-18 14:24:05 +03:00
JuliaSvinareva 537f007461 [mobile] Fix view comment for tablet 2021-05-17 19:51:12 +03:00
JuliaSvinareva 383620fbc7 [DE mobile] Fix templates 2021-05-17 16:14:41 +03:00
JuliaSvinareva 89b98477bf [PE mobile] Add skeleton 2021-05-17 13:51:50 +03:00
JuliaSvinareva 7e7ce909ac [mobile] Fix users into collaboration 2021-05-14 14:03:06 +03:00
JuliaSvinareva b968fb4d2d [mobile] Fix bug 48187 2021-05-14 12:49:10 +03:00
JuliaSvinareva 861c60caff Merge branch 'feature/mobile-apps-on-reactjs-fixes' into develop 2021-05-13 18:09:03 +03:00
JuliaSvinareva 2ae18c1787 [mobile] Fix template of user page 2021-05-12 20:00:00 +03:00
SergeyEzhin acc1f43a9a [common] Bug 47778 2021-05-07 17:34:02 +03:00
SergeyEzhin f6ff8b498d [common] Bug 48187 2021-05-06 15:59:37 +03:00
SergeyEzhin 2a7812bfa3 [common] Bug 37524 2021-05-06 15:01:29 +03:00
SergeyEzhin d55aad76ac Bug 49157 2021-05-05 16:06:07 +03:00
Maxim Kadushkin 295bc949c9 Merge branch 'feature/fix-bug-shimaginA' into develop 2021-05-05 00:31:01 +03:00
Julia Radzhabova 6eee4f8ae1 [Mobile] Fix plugins loading 2021-05-04 22:05:26 +03:00
SergeyEzhin 6f328beca6 Merge branch 'feature/mobile-apps-on-reactjs-pe-bug50044' into feature/mobile-apps-on-reactjs-fixes 2021-05-04 21:07:52 +03:00
Maxim Kadushkin fdda540c47 [all] fix loading sdk scripts 2021-05-03 20:02:21 +03:00
JuliaSvinareva 7bb9cc90ab Merge branch 'feature/mobile-apps-on-reactjs-bug50044' into develop 2021-05-01 18:41:17 +03:00
Maxim Kadushkin 75667dc229 Merge branch 'feature/mobile-apps-on-reactjs' into develop
# Conflicts:
#	apps/api/documents/api.js
#	apps/common/main/lib/util/utils.js
#	apps/documenteditor/mobile/app/controller/DocumentHolder.js
#	apps/documenteditor/mobile/app/controller/Main.js
#	apps/documenteditor/mobile/app/controller/Search.js
#	apps/documenteditor/mobile/app/controller/Settings.js
#	apps/documenteditor/mobile/app/controller/Toolbar.js
#	apps/documenteditor/mobile/app/controller/add/AddImage.js
#	apps/documenteditor/mobile/app/controller/add/AddOther.js
#	apps/documenteditor/mobile/app/controller/add/AddTable.js
#	apps/documenteditor/mobile/app/controller/edit/EditChart.js
#	apps/documenteditor/mobile/app/controller/edit/EditHyperlink.js
#	apps/documenteditor/mobile/app/controller/edit/EditImage.js
#	apps/documenteditor/mobile/app/controller/edit/EditParagraph.js
#	apps/documenteditor/mobile/app/controller/edit/EditShape.js
#	apps/documenteditor/mobile/app/controller/edit/EditTable.js
#	apps/documenteditor/mobile/app/controller/edit/EditText.js
#	apps/documenteditor/mobile/app/template/EditTable.template
#	apps/documenteditor/mobile/app/template/EditText.template
#	apps/documenteditor/mobile/app/template/Settings.template
#	apps/documenteditor/mobile/app/view/Settings.js
#	apps/documenteditor/mobile/app/view/add/AddOther.js
#	apps/documenteditor/mobile/app/view/edit/EditTable.js
#	apps/documenteditor/mobile/index.html
#	apps/documenteditor/mobile/index.html.deploy
#	apps/documenteditor/mobile/index_loader.html
#	apps/documenteditor/mobile/locale/en.json
#	apps/documenteditor/mobile/locale/ru.json
#	apps/documenteditor/mobile/resources/css/app-ios.css
#	apps/documenteditor/mobile/resources/css/app-material.css
#	apps/presentationeditor/main/app/view/SlideSettings.js
#	apps/presentationeditor/mobile/app-dev.js
#	apps/presentationeditor/mobile/app.js
#	apps/presentationeditor/mobile/app/controller/DocumentHolder.js
#	apps/presentationeditor/mobile/app/controller/Main.js
#	apps/presentationeditor/mobile/app/controller/Search.js
#	apps/presentationeditor/mobile/app/controller/Settings.js
#	apps/presentationeditor/mobile/app/controller/Toolbar.js
#	apps/presentationeditor/mobile/app/controller/add/AddImage.js
#	apps/presentationeditor/mobile/app/controller/add/AddLink.js
#	apps/presentationeditor/mobile/app/controller/add/AddTable.js
#	apps/presentationeditor/mobile/app/controller/edit/EditContainer.js
#	apps/presentationeditor/mobile/app/controller/edit/EditImage.js
#	apps/presentationeditor/mobile/app/controller/edit/EditLink.js
#	apps/presentationeditor/mobile/app/controller/edit/EditShape.js
#	apps/presentationeditor/mobile/app/controller/edit/EditSlide.js
#	apps/presentationeditor/mobile/app/controller/edit/EditTable.js
#	apps/presentationeditor/mobile/app/controller/edit/EditText.js
#	apps/presentationeditor/mobile/app/template/EditSlide.template
#	apps/presentationeditor/mobile/app/template/EditTable.template
#	apps/presentationeditor/mobile/app/template/EditText.template
#	apps/presentationeditor/mobile/app/view/Settings.js
#	apps/presentationeditor/mobile/app/view/add/AddOther.js
#	apps/presentationeditor/mobile/app/view/add/AddSlide.js
#	apps/presentationeditor/mobile/app/view/edit/EditSlide.js
#	apps/presentationeditor/mobile/app/view/edit/EditTable.js
#	apps/presentationeditor/mobile/index.html
#	apps/presentationeditor/mobile/index.html.deploy
#	apps/presentationeditor/mobile/index_loader.html
#	apps/presentationeditor/mobile/locale/cs.json
#	apps/presentationeditor/mobile/locale/de.json
#	apps/presentationeditor/mobile/locale/en.json
#	apps/presentationeditor/mobile/locale/es.json
#	apps/presentationeditor/mobile/locale/fr.json
#	apps/presentationeditor/mobile/locale/hu.json
#	apps/presentationeditor/mobile/locale/it.json
#	apps/presentationeditor/mobile/locale/ko.json
#	apps/presentationeditor/mobile/locale/nl.json
#	apps/presentationeditor/mobile/locale/pl.json
#	apps/presentationeditor/mobile/locale/pt.json
#	apps/presentationeditor/mobile/locale/ru.json
#	apps/presentationeditor/mobile/locale/sk.json
#	apps/presentationeditor/mobile/locale/zh.json
#	apps/presentationeditor/mobile/resources/css/app-ios.css
#	apps/presentationeditor/mobile/resources/css/app-material.css
#	apps/presentationeditor/mobile/resources/less/app-ios.less
#	apps/presentationeditor/mobile/resources/less/app-material.less
#	apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
#	apps/spreadsheeteditor/mobile/app/controller/FilterOptions.js
#	apps/spreadsheeteditor/mobile/app/controller/Main.js
#	apps/spreadsheeteditor/mobile/app/controller/Search.js
#	apps/spreadsheeteditor/mobile/app/controller/Settings.js
#	apps/spreadsheeteditor/mobile/app/controller/Statusbar.js
#	apps/spreadsheeteditor/mobile/app/controller/Toolbar.js
#	apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js
#	apps/spreadsheeteditor/mobile/app/controller/add/AddLink.js
#	apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditImage.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js
#	apps/spreadsheeteditor/mobile/app/template/EditCell.template
#	apps/spreadsheeteditor/mobile/app/template/EditImage.template
#	apps/spreadsheeteditor/mobile/app/template/EditText.template
#	apps/spreadsheeteditor/mobile/app/template/Settings.template
#	apps/spreadsheeteditor/mobile/app/view/Settings.js
#	apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js
#	apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
#	apps/spreadsheeteditor/mobile/app/view/edit/EditText.js
#	apps/spreadsheeteditor/mobile/index.html
#	apps/spreadsheeteditor/mobile/index.html.deploy
#	apps/spreadsheeteditor/mobile/index_loader.html
#	apps/spreadsheeteditor/mobile/locale/en.json
#	apps/spreadsheeteditor/mobile/resources/css/app-ios.css
#	apps/spreadsheeteditor/mobile/resources/css/app-material.css
#	apps/spreadsheeteditor/mobile/resources/less/app-material.less
#	apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less
#	apps/spreadsheeteditor/mobile/resources/less/material/_icons.less
#	apps/spreadsheeteditor/mobile/resources/less/statusbar.less
#	build/package.json
2021-04-30 19:29:10 +03:00
JuliaSvinareva 61998a2c04 [mobile] Add hide navbar when sheet-modal is opened 2021-04-30 16:29:41 +03:00
SergeyEzhin 4b0722ad91 [common] Correct searchbar 2021-04-30 16:10:30 +03:00
SergeyEzhin 45b0cb2bac [common] Edits toolbar and corrected searchbar 2021-04-30 01:18:03 +03:00
SergeyEzhin 482feeb67d Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-edits 2021-04-29 17:08:19 +03:00
SergeyEzhin 4f6251fcbc Merge branch 'feature/mobile-apps-on-reactjs-edits' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs-edits 2021-04-28 17:17:35 +03:00
SergeyEzhin 79cc895ea7 [DE PE mobile] Correct text settings and styles 2021-04-28 16:35:35 +03:00
JuliaSvinareva 4080a1ab27 Merge branch 'feature/mobile-apps-on-reactjs-edits' into feature/mobile-apps-on-reactjs 2021-04-28 12:34:17 +03:00
JuliaSvinareva cc80c72411 [mobile] Fix icons 2021-04-28 12:33:15 +03:00
SergeyEzhin 141cd15ab6 [DE PE SSE mobile] Moved icon-collaboration 2021-04-28 12:19:09 +03:00
JuliaSvinareva 8cdb629864 [mobile] Fix open context menu, when dialog is opened 2021-04-28 12:04:50 +03:00
JuliaSvinareva 1d51be59a6 Merge branch 'feature/mobile-apps-on-reactjs-plugins' into feature/mobile-apps-on-reactjs 2021-04-27 17:28:49 +03:00
SergeyEzhin a0538ee3e0 [common] Added plugins 2021-04-27 16:39:39 +03:00
JuliaSvinareva 160b2baf7f [mobile] Fix edit comments for tablet 2021-04-27 15:28:25 +03:00
ShimaginAndrey 3c97073b0e Merge branch 'feature/mobile-apps-on-reactjs' into feature/fix-bug-shimaginA 2021-04-27 15:18:14 +03:00
SergeyEzhin 33f1cc5985 [common] Make plugins 2021-04-27 00:02:07 +03:00
ShimaginAndrey bacd0b5423 Fix Bug 47237 modification 2021-04-26 09:20:52 +03:00
SergeyEzhin 7dc0aee800 [SSE mobile] Bug 48029 2021-04-23 16:33:12 +03:00
SergeyEzhin a490e8e239 [PE mobile] Bug 46990 2021-04-22 17:45:16 +03:00
ShimaginAndrey c6b68ab7c6 Fix Bug 47237 2021-04-21 14:46:02 +03:00
SergeyEzhin 4c7138a74f [common] Bug 47888 2021-04-20 18:34:21 +03:00
Maxim Kadushkin 3dd26e178b [common] switch off version compare for debug 2021-04-20 12:47:57 +03:00
JuliaSvinareva 92520c0e13 Merge branch 'feature/mobile-apps-on-reactjs-fixes' into feature/mobile-apps-on-reactjs 2021-04-15 13:26:46 +03:00
JuliaSvinareva 0277ac9306 [PE mobile] Add toolbar, add logo 2021-04-15 12:42:44 +03:00
Julia Radzhabova c2e0ffb2be Merge branch 'release/v6.3.0' into develop 2021-04-15 11:18:07 +03:00
JuliaSvinareva 87fb7fe1bd [DE mobile] Add check to show logo in navbar 2021-04-14 20:27:33 +03:00
JuliaSvinareva eb6a25140d [DE mobile] Add check to hide review in collaboration 2021-04-13 18:23:37 +03:00
Maxim Kadushkin a9dda7fe6f [common] don't open context menu if no items 2021-04-12 18:10:03 +03:00
JuliaSvinareva bc7713368a [DE mobile] Add preloader for long actions 2021-04-07 20:15:09 +03:00
Julia Radzhabova 49eba78cbc Set plugin version 2021-04-06 21:25:24 +03:00
JuliaSvinareva 93152efb32 [DE mobile] Add apply license in main controller 2021-04-04 18:01:19 +03:00
SergeyEzhin 5d68405408 [DE SSE mobile] Bug 48776 2021-04-02 16:16:23 +03:00
JuliaSvinareva babe1233a9 [mobile] Add handler for try undo in fast collaborative 2021-04-01 23:27:58 +03:00
JuliaSvinareva de241c88a6 [mobile] Fix page offset 2021-04-01 23:25:09 +03:00
SergeyEzhin 0bbd65fadd [PE mobile] Bug 47909, Bug 48110 2021-04-01 18:50:48 +03:00
JuliaSvinareva ccaf637c6a [DE mobile] Fix open searchbar, add logo in navbar 2021-03-31 22:23:53 +03:00
JuliaSvinareva d64eae031a [DE mobile] Make toolbar controller 2021-03-30 23:11:49 +03:00
SergeyEzhin dd3b5fafe0 [SSE mobile] Corrected some things 2021-03-30 17:51:53 +03:00
Julia Radzhabova b1d3ba3fc0 Merge branch 'release/v6.3.0' into develop 2021-03-29 16:33:45 +03:00
JuliaSvinareva 8d2f89b62e Merge branch 'feature/mobile-apps-on-reactjs-statusbar' into feature/mobile-apps-on-reactjs 2021-03-29 14:49:40 +03:00
JuliaSvinareva f9f53e6dfc Merge branch 'feature/mobile-apps-on-reactjs-about' into feature/mobile-apps-on-reactjs 2021-03-29 13:38:22 +03:00
Julia Radzhabova 78229a2bab Merge branch 'develop' into feature/comment-permissions 2021-03-28 22:18:19 +03:00
Julia Radzhabova 7092ae1cbc [Mobile] Fix plugins loading 2021-03-27 22:53:36 +03:00
Julia Radzhabova cc3df7db90 [DE mobile] Fix review permissions 2021-03-26 20:54:38 +03:00
Julia Radzhabova 0b2a3aec7e Add event onPluginsReady 2021-03-26 20:37:29 +03:00
Julia Radzhabova 2a6ed8f973 [DE] Fix review groups 2021-03-26 20:32:25 +03:00
SergeyEzhin 1876de1e87 [mobile] Corrected About 2021-03-26 17:48:18 +03:00
JuliaSvinareva 465fd40004 [SSE mobile] Fix comments 2021-03-26 16:23:17 +03:00
Julia Radzhabova 3b901f91e4 Use sdk class 2021-03-26 14:29:16 +03:00
SergeyEzhin 705509e340 [SSE mobile] Add styles, corrected unhide and hiding 2021-03-25 23:34:22 +03:00
JuliaSvinareva 56e316738e [SSE mobile] Add comments 2021-03-25 01:07:10 +03:00
JuliaSvinareva 4b0ec3e352 [PE mobile] Add context menu 2021-03-23 14:05:45 +03:00
JuliaSvinareva 7fb9407ef6 [PE mobile] Add checking of hide insert comment, connecting comment components 2021-03-22 14:35:16 +03:00
JuliaSvinareva db7c7343c5 [mobile] Add reset of coauthoring disconnect option in users store 2021-03-20 19:01:26 +03:00
JuliaSvinareva eda4736916 [mobile] Show foreign cursor label, enable collaboration fast mode 2021-03-19 19:11:57 +03:00
JuliaSvinareva f33112be3a [mobile] Fix icons 2021-03-19 13:53:33 +03:00
Julia Radzhabova 916c911ac7 [Mobile] Use config permssions to view comments 2021-03-17 23:57:54 +03:00
JuliaSvinareva 4687d2b127 [DE mobile] Add review, review change handler in context menu 2021-03-17 21:57:52 +03:00
SergeyEzhin 573d1c49c5 [mobile] Added About 2021-03-17 18:44:35 +03:00
Julia Radzhabova f35e929713 Add permissions for edit/remove comments 2021-03-17 12:02:06 +03:00
JuliaSvinareva c5ef8766d6 [DE mobile] Add cut, copy, paste handler in context menu 2021-03-17 11:46:57 +03:00
JuliaSvinareva fd561f3687 Merge branch 'feature/mobile-apps-on-reactjs-se-edit-settings' into feature/mobile-apps-on-reactjs 2021-03-16 20:49:55 +03:00
Julia Radzhabova 5a373f76bb [DE mobile] Refactoring review permissions 2021-03-16 20:17:35 +03:00
JuliaSvinareva 586dbd5449 Merge branch 'feature/mobile-apps-on-reactjs-de' into feature/mobile-apps-on-reactjs 2021-03-16 19:42:45 +03:00
JuliaSvinareva b4bd17d0bc [mobile] Add actions for more items in context menu 2021-03-16 16:27:47 +03:00
SergeyEzhin 32f5bd693e [DE PE mobile] Correcting Find and Replace 2021-03-15 21:35:19 +03:00
SergeyEzhin 0fa56cd60b [SSE mobile] Corrected stores according to mobx v. 6 2021-03-15 16:39:45 +03:00
SergeyEzhin a556f4e196 [SSE mobile] Correcting Find and Replace 2021-03-12 20:54:11 +03:00
JuliaSvinareva 299db5fcb6 [mobile] Make view current comments (fix on tablet, add reply, prev and next comment, add styles) 2021-03-11 23:38:53 +03:00
SergeyEzhin 99fc32bf99 [SSE mobile] Added Find and Replace 2021-03-11 20:21:55 +03:00
JuliaSvinareva f5d48e6492 [mobile] Make view current comments, fixed change comment 2021-03-10 21:08:59 +03:00
SergeyEzhin 5d06b05a51 Merge branch 'feature/mobile-apps-on-reactjs-de' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs-de 2021-03-10 19:51:56 +03:00
SergeyEzhin de79f6e526 [PE mobile] Added Find and Replace 2021-03-10 19:51:22 +03:00
Maxim Kadushkin bb6172015c [common mobile] fixes for mobx ver 6 2021-03-10 16:58:14 +03:00
Maxim Kadushkin d3163b0be0 Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-de
# Conflicts:
#	apps/common/mobile/resources/less/ios/icons.less
#	apps/common/mobile/resources/less/material/icons.less
2021-03-10 10:41:56 +03:00
SergeyEzhin e0258fa0b7 [DE mobile] Corrected Find and Replace 2021-03-09 22:42:29 +03:00
JuliaSvinareva c9e5a41954 [mobile] Fixed swipe animation of view current comment 2021-03-09 19:29:06 +03:00
JuliaSvinareva 1cf1bb5df3 [mobile] Fix users and comments stores according to mobx v. 6 2021-03-09 15:27:26 +03:00
JuliaSvinareva 48c50b145b [mobile] Make comment view from context menu 2021-03-08 21:30:42 +03:00
SergeyEzhin e866cec627 [DE mobile] Small edits of styles 2021-03-05 23:11:07 +03:00
SergeyEzhin f067ea4622 [DE mobile] Make Find and Replace for ios and android 2021-03-05 20:53:37 +03:00
JuliaSvinareva 79e1acb89d [mobile] Open add comment from context menu 2021-03-05 18:23:35 +03:00
JuliaSvinareva 7cf42452ae [mobile] Add styles of comments for android 2021-03-04 20:25:50 +03:00
JuliaSvinareva 0f2a4d8138 [mobile] Fix comments 2021-03-04 20:24:35 +03:00
SergeyEzhin d3dfbb3771 [DE mobile] Deleted flex-wrap from Searchbar Inner 2021-03-04 14:07:11 +03:00
SergeyEzhin f9ffaf6891 [DE mobile] Added Replace All and adding styles for phones 2021-03-03 22:52:16 +03:00
JuliaSvinareva e8749b09d6 [mobile] Comments (edit reply) 2021-03-03 21:21:03 +03:00
JuliaSvinareva 8410b269c4 [mobile] Comments (edit comment, add reply) 2021-03-03 19:49:36 +03:00
Maxim Kadushkin 5c53f958f8 [DE mobile] context menu depends on selected objects 2021-03-03 14:47:49 +03:00
SergeyEzhin ed550f1dce [DE mobile] Added replacing 2021-03-02 22:33:26 +03:00
JuliaSvinareva 2a90efa7b0 [mobile] Comments (applying comment display) 2021-03-01 23:09:39 +03:00
Maxim Kadushkin dd78ba9395 [mobile] fixed context menu 2021-03-01 21:55:58 +03:00
SergeyEzhin 4ed2a8a3c4 [SSE mobile] Added Spreadsheet About 2021-03-01 21:11:29 +03:00
JuliaSvinareva 37cce9d295 [mobile] Comments (add actions: resolve/reopen, delete comment; check canViewComments to display list of comments; change styles) 2021-02-28 20:47:47 +03:00
SergeyEzhin 9d1ccf2f84 [SSE mobile] Added Regional Settings 2021-02-25 20:42:07 +03:00
JuliaSvinareva c3dd451d7a [mobile] Made receiving and displaying comments into collaboration 2021-02-25 19:26:42 +03:00
Maxim Kadushkin 1c45047df5 [SSE mobile] repaired cell editor 2021-02-20 00:05:06 +03:00
Maxim Kadushkin 2942114c82 [SSE mobile] 2021-02-20 00:04:12 +03:00
JuliaSvinareva 060e51b47a [DE mobile] Refactoring review (remove html tags from translations, create array of elements instead of string) 2021-02-19 12:22:10 +03:00
JuliaSvinareva a97d9d6aa9 Merge branch 'feature/mobile-apps-on-reactjs' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs 2021-02-18 18:44:30 +03:00
JuliaSvinareva c446eb4db4 [mobile][de] Add insert comment 2021-02-18 18:40:54 +03:00
SergeyEzhin 37248d0c0e [SSE mobile] Corrected styles, Chart Settings and added Link Settings 2021-02-17 20:53:17 +03:00
SergeyEzhin 1cb18ade25 [SSE mobile] Corrected Text Settings and Chart Settings 2021-02-17 14:28:02 +03:00
Maxim Kadushkin d6c6bc389b [DE mobile] fix context menu close 2021-02-16 20:31:27 +03:00
SergeyEzhin cc5e415edd [SSE mobile] Added Chart Settings 2021-02-15 23:51:33 +03:00
JuliaSvinareva 4e8be323a8 [DE mobile] Add review settings 2021-02-12 20:33:38 +03:00
JuliaSvinareva 96795be9a6 Merge branch 'feature/mobile-apps-on-reactjs' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs 2021-02-12 02:34:27 +03:00
JuliaSvinareva c3437aa762 [DE mobile] Add review settings 2021-02-12 02:34:01 +03:00