Commit graph

87 commits

Author SHA1 Message Date
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
ShimaginAndrey 581b7f690f Correct and add styles v2 2021-11-18 17:45:51 +03:00
SergeyEzhin 8ed2d0d652 Edit and add styles v.3 2021-11-18 01:58:22 +04:00
ShimaginAndrey 8acc06d03e Correct styles and fonts 2021-11-15 10:55:21 +03:00
SergeyEzhin 70754ae4a5 Edit and add styles v.2 2021-11-13 02:05:39 +04:00
SergeyEzhin 9ee2d88654 [common] Edit styles 2021-11-11 01:18:55 +04:00
ShimaginAndrey c9aa0168e2 Edit styles 2021-11-10 09:39:21 +03:00
SergeyEzhin e05f5216d1 [common] Edit styles and icons 2021-11-10 00:33:54 +04:00
Maxim Kadushkin e5784c8d01 [PE mobile] colors table refactoring 2021-11-09 12:44:27 +03:00
ShimaginAndrey b318613837 Adding a dark style 2021-11-06 13:11:18 +03:00
SergeyEzhin cd16fa0c32 [PE mobile] Add variables 2021-11-05 21:48:28 +04:00
SergeyEzhin 938a0e353b Add variables from colors table 2021-11-05 01:11:52 +04:00
Maxim Kadushkin ec46276bea [mobile] for bug 53253 2021-10-22 23:03:03 +03:00
maxkadushkin a707da477c
Merge pull request #919 from ONLYOFFICE/feature/release-fixes
Feature/release fixes
2021-06-09 19:20:29 +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
JuliaSvinareva 861c60caff Merge branch 'feature/mobile-apps-on-reactjs-fixes' into develop 2021-05-13 18:09:03 +03:00
SergeyEzhin acc1f43a9a [common] Bug 47778 2021-05-07 17:34:02 +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 cc80c72411 [mobile] Fix icons 2021-04-28 12:33:15 +03:00
JuliaSvinareva ccaf637c6a [DE mobile] Fix open searchbar, add logo in navbar 2021-03-31 22:23:53 +03:00
JuliaSvinareva 4b0ec3e352 [PE mobile] Add context menu 2021-03-23 14:05:45 +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
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 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
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 48c50b145b [mobile] Make comment view from context menu 2021-03-08 21:30:42 +03:00
JuliaSvinareva 7cf42452ae [mobile] Add styles of comments for android 2021-03-04 20:25:50 +03:00
JuliaSvinareva c446eb4db4 [mobile][de] Add insert comment 2021-02-18 18:40:54 +03:00
Maxim Kadushkin 89d297ea9c [DE mobile] context menu moved to common 2021-02-10 00:01:42 +03:00
Maxim Kadushkin 1c3e77c22b [stylesheets mobile] refactoring for icons 2021-02-09 23:59:49 +03:00
Julia Radzhabova e69c7968ad [DE mobile] Fix text auto color 2020-10-28 16:55:22 +03:00
JuliaSvinareva 5708510830 [mobile] Comments (fix styles) 2020-06-09 19:36:00 +03:00
JuliaSvinareva a626ca471d [mobile] Fix bug 45445 2020-05-26 22:28:35 +03:00
JuliaSvinareva a9984c8eee [DE mobile] Change review template 2020-05-13 18:59:42 +03:00
JuliaSvinareva b944ddccfc [mobile] Comments (remove textarea border, increased font, remove tabs animation, add placeholder, changed modal window of delete comment draft) 2020-05-07 19:28:58 +03:00
JuliaSvinareva add8ec8621 [mobile] Fix comments 2020-05-06 15:46:12 +03:00
JuliaSvinareva 43c5300cdc [mobile] Comments (fix bugs) 2020-04-24 14:30:55 +03:00
JuliaSvinareva 5fa1b9dbb5 [mobile] Comments (refactoring, moved comment editing) 2020-04-21 18:36:06 +03:00
JuliaSvinareva baf8ae6074 Merge branch 'develop' into feature/mobile-comments 2020-04-06 19:17:02 +03:00
JuliaSvinareva cc4110dd5e [DE mobile] Fix view/add/edit/delete comments 2020-04-03 21:01:26 +03:00
JuliaSvinareva 22604c0567 [de mobile] work with comments (fix styles) 2020-04-02 18:30:36 +03:00
JuliaSvinareva 218929dd3e [DE mobile] add edit comments into collaboration section 2020-04-01 20:34:51 +03:00
JuliaSvinareva 2422fab071 [DE mobile] Add style of comments view for android 2020-03-31 20:14:05 +03:00
JuliaSvinareva 23f6028575 [de mobile] add comment move to add other 2020-03-30 19:52:13 +03:00