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
..
_about.less	[all] changed templates and styles for vary production	2019-02-28 16:14:41 +03:00
_button.less	[DE mobile] Less to modules	2016-11-15 15:32:11 +03:00
_collaboration.less	[mobile] Fix bug 45445	2020-05-26 22:28:35 +03:00
_color-palette.less	[DE mobile] Fix text auto color	2020-10-28 16:55:22 +03:00
_color-schema.less	Fix bug 43877 (add display of the current color scheme)	2019-12-24 16:58:06 +03:00
_container.less	[mobile] Сhanged tabs template into insert	2020-04-30 12:55:09 +03:00
_contextmenu.less	[DE mobile][PE][SSE] Merge from develop.	2017-04-11 14:05:56 +03:00
_dataview.less	[SE mobile] Chart settings, layout	2016-12-14 17:14:00 +03:00
_listview.less	[SE mobile] Edit hyperlink	2016-12-20 14:33:24 +03:00
comments.less	[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
contextmenu.less	[DE mobile] context menu moved to common	2021-02-10 00:01:42 +03:00
icons.less	[DE mobile] Fix open searchbar, add logo in navbar	2021-03-31 22:23:53 +03:00