Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
8258 commits 47 branches 5000 tags 623 MiB
Commit graph

979 commits

Author SHA1 Message Date
Julia Radzhabova d7d387c27a Update translation 2021-05-14 15:02:42 +03:00
JuliaSvinareva 861c60caff Merge branch 'feature/mobile-apps-on-reactjs-fixes' into develop 2021-05-13 18:09:03 +03:00
JuliaSvinareva f221d2202e [DE mobile] Add orthography check for sailfish 2021-05-12 15:05:17 +03:00
JuliaSvinareva bd08e74547 [mobile] Fix collaboration display 2021-05-12 14:27:03 +03:00
Maxim Kadushkin 486afef46d [all] debug deployment 2021-05-12 13:44:17 +03:00
JuliaSvinareva cc7d9acfaa [DE PE mobile] Bug 50044 2021-05-11 18:52:36 +03:00
Julia Radzhabova 6360a44929 Update translation 2021-05-07 12:34:03 +03:00
SergeyEzhin 5c6d736f9a [DE PE SSE mobile] Bug 47749 2021-05-06 15:29:19 +03:00
SergeyEzhin 0b17b27492 Bug 49336 2021-05-05 19:04:31 +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
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 374d67c75a Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 
# Conflicts:
#	apps/presentationeditor/mobile/locale/pt.json
 2021-04-30 19:35:55 +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
Julia Radzhabova 45aee08641 Update translation 2021-04-30 18:25:46 +03:00
JuliaSvinareva 61998a2c04 [mobile] Add hide navbar when sheet-modal is opened 2021-04-30 16:29:41 +03:00
Julia Radzhabova 7fb36f66f1 Update translation. Fix Bug 50049, Fix Bug 50061 2021-04-30 16:28:59 +03:00
SergeyEzhin d7fe83da9f [DE mobile] Corrected icon-search 2021-04-30 11:51:57 +03:00
SergeyEzhin 45b0cb2bac [common] Edits toolbar and corrected searchbar 2021-04-30 01:18:03 +03:00
Maxim Kadushkin 97474af94d Merge branch 'release/v6.3.0' into develop 
# Conflicts:
#	apps/common/main/lib/controller/Plugins.js
#	apps/common/main/lib/view/Header.js
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/documenteditor/main/app/view/Toolbar.js
#	apps/documenteditor/main/locale/sl.json
#	apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/presentationeditor/main/locale/ja.json
#	apps/spreadsheeteditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/template/Toolbar.template
#	apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
 2021-04-29 23:31:07 +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
JuliaSvinareva 5832ba5551 [DE mobile] Bug 50044 2021-04-29 14:42:44 +03:00
JuliaSvinareva 2d91270e18 [DE mobile] Fix edit header 2021-04-29 14:16:24 +03:00
JuliaSvinareva 261f4d701b [DE mobile] Fix warnings 2021-04-29 14:12:14 +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
SergeyEzhin 141cd15ab6 [DE PE SSE mobile] Moved icon-collaboration 2021-04-28 12:19:09 +03:00
SergeyEzhin 072f84a27c [DE PE SSE mobile] Corrected display collaboration 2021-04-28 01:15:16 +03:00
JuliaSvinareva 5f59be85ee [DE mobile] Bug 50044 2021-04-27 20:04:43 +03:00
Julia Radzhabova dce1a7a54c Fix Bug 50044 2021-04-27 17:31:38 +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 8fb2dc61d5 Merge branch 'feature/mobile-apps-on-reactjs-fixes' into feature/mobile-apps-on-reactjs 2021-04-27 11:13:33 +03:00
JuliaSvinareva ad5104c8c5 [mobile] Fix long actions controller 2021-04-26 18:43:12 +03:00
Julia Radzhabova c12aae8a0f Update translation 2021-04-24 01:24:45 +03:00
Julia Radzhabova be9918cfa3 Update translation 2021-04-23 16:24:35 +03:00
JuliaSvinareva d66852e540 [DE PE mobile] Refactoring long actions controller 2021-04-22 21:55:57 +03:00
SergeyEzhin fe34b1c3e3 [DE mobile] Bug 47403 2021-04-21 18:38:06 +03:00
ShimaginAndrey a4d55fac57 Fix Bug 49412 2021-04-21 16:54:12 +03:00
ShimaginAndrey f8d0499d22 Fix Bug 48285 2021-04-21 14:37:14 +03:00
JuliaSvinareva 02b0697607 Merge branch 'feature/mobile-apps-on-reactjs' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs 2021-04-20 19:52:49 +03:00
JuliaSvinareva 57043e6602 [DE mobile] Changes related to main controller 2021-04-20 19:49:49 +03:00
Maxim Kadushkin 3dd26e178b [common] switch off version compare for debug 2021-04-20 12:47:57 +03:00
JuliaSvinareva 45a9058da4 [DE PE mobile] Changes for private branch 2021-04-16 19:03:30 +03:00
JuliaSvinareva c49fc13b80 [DE mobile] Fix show context menu items for view mode 2021-04-15 15:42:51 +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
JuliaSvinareva 0277ac9306 [PE mobile] Add toolbar, add logo 2021-04-15 12:42:44 +03:00
JuliaSvinareva 87fb7fe1bd [DE mobile] Add check to show logo in navbar 2021-04-14 20:27:33 +03:00
JuliaSvinareva eb6a25140d [DE mobile] Add check to hide review in collaboration 2021-04-13 18:23:37 +03:00
JuliaSvinareva 437fed37c0 [DE mobile] Add reader mode and print handlers in settings 2021-04-13 17:41:24 +03:00
JuliaSvinareva cd1aa44b5c [DE mobile] Hide options in toolbar for view mode 2021-04-13 15:37:31 +03:00
JuliaSvinareva 30b08d1dbb [DE mobile] Make document content ready in main controller, fix analytics error 2021-04-13 13:51:21 +03:00
JuliaSvinareva 813efeb874 Merge branch 'feature/mobile-apps-on-reactjs' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs 2021-04-12 19:04:05 +03:00
JuliaSvinareva 89d8b3703e [DE mobile] Make main controller, add run autostart macroses 2021-04-12 19:03:42 +03:00
Maxim Kadushkin b0c9a1c5d2 [DE mobile] changes for private Editor controller 2021-04-12 18:16:34 +03:00
Maxim Kadushkin 84650bb71d [DE mobile] refactoring 2021-04-12 18:10:53 +03:00
Maxim Kadushkin 2bd901f3a6 [DE mobile] changes for private branch 2021-04-12 18:09:08 +03:00
JuliaSvinareva cf7141f756 [DE mobile] Added macros mode initialization when loading a document 2021-04-12 15:42:20 +03:00
JuliaSvinareva 0f76a31706 [DE mobile] Added replacement of company name in translations 2021-04-12 15:10:14 +03:00
JuliaSvinareva 8d6ea8f464 [DE mobile] Make main controller 2021-04-09 21:08:13 +03:00
JuliaSvinareva 904e9baf05 [DE mobile] Long action handler moved to a separate controller 2021-04-08 21:00:44 +03:00
JuliaSvinareva 2ea2d5238e Merge branch 'feature/mobile-apps-on-reactjs' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs 2021-04-08 18:35:11 +03:00
JuliaSvinareva 3bcd2a55a7 [DE mobile] Add error controller 2021-04-08 18:34:57 +03:00
Maxim Kadushkin ee15cf025d [DE mobile] refactoring in Main controller 2021-04-08 17:28:02 +03:00
Maxim Kadushkin 6c628b62ec [DE mobile] added missed functions 2021-04-08 17:26:59 +03:00
Maxim Kadushkin 94b4ebc18c [DE mobile] refactoring for patch code 2021-04-08 17:26:33 +03:00
JuliaSvinareva bc7713368a [DE mobile] Add preloader for long actions 2021-04-07 20:15:09 +03:00
JuliaSvinareva 2b355ce7ec Merge branch 'feature/mobile-apps-on-reactjs' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs 2021-04-04 18:15:34 +03:00
JuliaSvinareva 93152efb32 [DE mobile] Add apply license in main controller 2021-04-04 18:01:19 +03:00
Maxim Kadushkin dc4c20081b [DE mobile] extended controller for private functions 2021-04-03 18:38:32 +03:00
Julia Radzhabova 9b6ec674de
Merge pull request #779 from ONLYOFFICE/release/v6.3.0 
Release/v6.3.0
 2021-04-02 11:53:39 +03:00
Julia Radzhabova 30e02a93fc Update translation 2021-04-02 11:39:51 +03:00
JuliaSvinareva 0283f82a4d [DE mobile] Add apply mode in main controller 2021-04-01 23:29:56 +03:00
JuliaSvinareva babe1233a9 [mobile] Add handler for try undo in fast collaborative 2021-04-01 23:27:58 +03:00
JuliaSvinareva ccaf637c6a [DE mobile] Fix open searchbar, add logo in navbar 2021-03-31 22:23:53 +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 7e88e04dd2 For Bug 47092 2021-03-30 16:30:01 +03:00
JuliaSvinareva d1c32d886f [mobile] Fix add custom color 2021-03-30 16:19:20 +03:00
SergeyEzhin 5a090f8210 Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-fixes 2021-03-30 15:36:06 +03:00
Julia Radzhabova 1e18f144c2 Merge branch 'fix/request-close' into develop 2021-03-30 15:34:56 +03:00
Julia Radzhabova b1d3ba3fc0 Merge branch 'release/v6.3.0' into develop 2021-03-29 16:33:45 +03:00
Julia Radzhabova 84d357560e Add method requestClose (show warning on unsaved changes) 2021-03-29 14:30:31 +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
Maxim Kadushkin 09102047c1 [DE mobile] load private functions patch 2021-03-28 00:28:07 +03:00
Julia Radzhabova c788ba2dd1 [DE mobile] Fix image editing 2021-03-27 23:53:36 +03:00
Julia Radzhabova bdd940623b Update translation 2021-03-27 01:02:56 +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
Julia Radzhabova 3b901f91e4 Use sdk class 2021-03-26 14:29:16 +03:00
JuliaSvinareva db7c7343c5 [mobile] Add reset of coauthoring disconnect option in users store 2021-03-20 19:01:26 +03:00
Julia Radzhabova af181a55b2 Update translation 2021-03-19 22:18:18 +03:00
Julia Radzhabova 7c025d7967 Update translation 2021-03-19 22:08:12 +03:00
JuliaSvinareva eda4736916 [mobile] Show foreign cursor label, enable collaboration fast mode 2021-03-19 19:11:57 +03:00
JuliaSvinareva bf7f2e43f9 [DE mobile] Add insert, open link handler in context menu 2021-03-18 20:37:29 +03:00
JuliaSvinareva cb62ade641 [DE mobile] Add merge, split, delete, delete table, edit handler in context menu 2021-03-18 17:35:25 +03:00
SergeyEzhin 90b613d88d [mobile] Corrected some elements 2021-03-18 17:00:52 +03:00