Commit graph

305 commits

Author SHA1 Message Date
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 7dfb96f914 [DE] Add simple markup mode for display review changes 2021-08-04 13:19:19 +03:00
SergeyEzhin 9b31aee15b [DE mobile] Fix Bug 51670 2021-08-03 18:14:45 +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
ShimaginAndrey 947dc9635a Fix set_MinVersion 2021-07-20 15:25:23 +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
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
SergeyEzhin 662ee6d9a5 [DE PE SSE mobile] Fix Bug 51134 2021-07-09 19:04:06 +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
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
maxkadushkin 4e2962174b
Merge branch 'release/v6.4.0' into feature/fix-bug-reactjs 2021-06-23 16:19:29 +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
SergeyEzhin 582b29cabf [common] Fix Bug 48242 2021-06-17 21:38:09 +03:00
JuliaSvinareva bbbfb5ddde [mobile] Fix plugins 2021-06-17 18:24:31 +03:00
JuliaSvinareva 5c63e5cb0e [common] Fix bug 48484 2021-06-09 17:17:42 +03:00
SergeyEzhin 55de02cb15 [common] Fig Bug 48484 2021-06-08 16:59:11 +03:00
SergeyEzhin 47a4436d06 [DE PE SSE mobile] Correct application settings and comments 2021-06-07 19:54:19 +03:00
SergeyEzhin c2d5da8395 [common] Bug 48484 2021-06-03 00:31:39 +03:00
SergeyEzhin 27dc6495a4 [PE mobile] Bug 47978 2021-05-31 18:08:02 +03:00
SergeyEzhin c254f2c93a Corrected replace all 2021-05-27 15:41:15 +03:00
JuliaSvinareva 642f72f182 Merge branch 'feature/fix-bug-shimaginA' into develop 2021-05-25 18:01:22 +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 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 7e7ce909ac [mobile] Fix users into collaboration 2021-05-14 14:03:06 +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 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
Maxim Kadushkin fdda540c47 [all] fix loading sdk scripts 2021-05-03 20:02:21 +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
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
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
ShimaginAndrey c6b68ab7c6 Fix Bug 47237 2021-04-21 14:46:02 +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
Julia Radzhabova c2e0ffb2be Merge branch 'release/v6.3.0' into develop 2021-04-15 11:18:07 +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
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
JuliaSvinareva babe1233a9 [mobile] Add handler for try undo in fast collaborative 2021-04-01 23:27:58 +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 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