Commit graph

379 commits

Author SHA1 Message Date
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
SergeyEzhin 47a4436d06 [DE PE SSE mobile] Correct application settings and comments 2021-06-07 19:54:19 +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
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