Commit graph

235 commits

Author SHA1 Message Date
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 45b0cb2bac [common] Edits toolbar and corrected searchbar 2021-04-30 01:18:03 +03:00
SergeyEzhin 072f84a27c [DE PE SSE mobile] Corrected display collaboration 2021-04-28 01:15:16 +03:00
JuliaSvinareva 8fb9119f01 [SSE mobile] Make main controller 2021-04-24 17:57:44 +03:00
Julia Radzhabova be9918cfa3 Update translation 2021-04-23 16:24:35 +03:00
JuliaSvinareva 0d82918ed5 [SSE mobile] Add error controller, add long actions controller 2021-04-22 21:57:08 +03:00
JuliaSvinareva cfbb8ce795 [SSE mobile] Add toolbar, add logo 2021-04-21 21:04:52 +03:00
Julia Radzhabova a910082c4c [SSE mobile] Fix Bug 49728 2021-04-19 20:11:09 +03:00
Julia Radzhabova 94c9e77313 Update translation 2021-04-16 17:18:23 +03:00
JuliaSvinareva babe1233a9 [mobile] Add handler for try undo in fast collaborative 2021-04-01 23:27:58 +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
JuliaSvinareva eb5a3b438f [SSE mobile] Add context menu 2021-03-27 16:33:27 +03:00
Julia Radzhabova 39ddc24254 Update translation 2021-03-27 00:12:55 +03:00
SergeyEzhin 1876de1e87 [mobile] Corrected About 2021-03-26 17:48:18 +03:00
JuliaSvinareva 56e316738e [SSE mobile] Add comments 2021-03-25 01:07:10 +03:00
SergeyEzhin 5b08a8b796 [SSE mobile] Add unhide 2021-03-23 16:43:10 +03:00
SergeyEzhin 09a494e245 [SSE mobile] Another try 2021-03-20 20:18:14 +03:00
Julia Radzhabova 7c025d7967 Update translation 2021-03-19 22:08:12 +03:00
SergeyEzhin 573d1c49c5 [mobile] Added About 2021-03-17 18:44:35 +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 d8a5e8244a Update translation 2021-03-12 20:53:03 +03:00
SergeyEzhin 99fc32bf99 [SSE mobile] Added Find and Replace 2021-03-11 20:21:55 +03:00
Julia Radzhabova b0fedaa13f Merge branch 'master' into release/v6.3.0 2021-03-04 13:51:02 +03:00
SergeyEzhin 4ed2a8a3c4 [SSE mobile] Added Spreadsheet About 2021-03-01 21:11:29 +03:00
Julia Radzhabova deae069826 Update translation 2021-02-26 17:53:24 +03:00
SergeyEzhin 2c44e7f3a3 [SSE mobile] Added Spreadsheet Info and App Options 2021-02-25 17:10:28 +03:00
SergeyEzhin 935b7c7d57 [SSE mobile] Added Application Settings without Regional Settings 2021-02-23 17:17:44 +03:00
SergeyEzhin df81b70d06 [SSE mobile] Corrected Spreadsheet Settings, added Download, Print 2021-02-19 21:09:38 +03:00
Julia Radzhabova 01b693f9c0 Update translation 2021-02-19 18:51:58 +03:00
Julia Radzhabova 8b1fd47bba Update translation 2021-02-19 13:48:37 +03:00
SergeyEzhin aeb2daacab [SSE mobile] Make Spreadsheet Settings 2021-02-18 22:15:50 +03:00
SergeyEzhin 37248d0c0e [SSE mobile] Corrected styles, Chart Settings and added Link Settings 2021-02-17 20:53:17 +03:00
SergeyEzhin cc5e415edd [SSE mobile] Added Chart Settings 2021-02-15 23:51:33 +03:00
Julia Radzhabova 0e5e7f81e2 Update translation 2021-02-12 17:59:34 +03:00
JuliaSvinareva c3437aa762 [DE mobile] Add review settings 2021-02-12 02:34:01 +03:00
SergeyEzhin cf7bda258f [SSE mobile] Make Chart Settings 2021-02-10 22:00:08 +03:00
Julia Radzhabova 7bb7d883dd [SSE mobile] Fix Bug 48664 2021-02-10 21:00:22 +03:00
SergeyEzhin 7981bd1b43 [SSE mobile] Almost maked Cell Settings 2021-02-09 01:10:06 +03:00
SergeyEzhin ef0449b49b Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-se-edit-settings 2021-02-08 16:53:15 +03:00
JuliaSvinareva 2317bb594f [SSE mobile] Added sort and filter into Add Other 2021-02-07 23:40:26 +03:00
JuliaSvinareva 683a9722e5 [SSE mobile] Added the ability insert links 2021-02-07 18:12:18 +03:00
SergeyEzhin 0fea919d9c [SSE mobile] Maked Fonts, Text Format, Text Orientation, Border Style in Cell Settings 2021-02-05 23:28:55 +03:00
Julia Radzhabova a79e733de4 Update translation 2021-02-05 16:34:50 +03:00
Julia Radzhabova 6d02752fce Update translation 2021-02-05 14:56:57 +03:00
SergeyEzhin 507ce63a98 [SSE mobile] Make Cell Settings 2021-02-04 21:00:21 +03:00
JuliaSvinareva 6e81f03df5 [SSE mobile] Added the ability to insert image 2021-02-04 18:58:54 +03:00
JuliaSvinareva a81459fcd6 Merge branch 'feature/mobile-apps-on-reactjs-se-edit-settings' into feature/mobile-apps-on-reactjs 2021-02-04 14:22:52 +03:00
SergeyEzhin 4bf9c5c6cd [SE mobile] Added Image Settings 2021-02-03 19:05:04 +03:00
JuliaSvinareva 63ca826d40 [SSE mobile] Add insert of functions (init functions, quick functions) 2021-02-03 03:30:39 +03:00