Commit graph

3721 commits

Author SHA1 Message Date
JuliaSvinareva 6c6f0899ef Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 2021-05-14 15:27:11 +03:00
JuliaSvinareva 18e9f7441b [SSE mobile] Fix error in long actions controller 2021-05-14 15:26:38 +03:00
Julia Radzhabova a4b302e590 [SSE mobile] Change formulas descriptions 2021-05-14 15:26:31 +03:00
Julia Radzhabova 149f748f59 Update translation 2021-05-14 15:15:14 +03:00
Julia Radzhabova d7d387c27a Update translation 2021-05-14 15:02:42 +03:00
GoshaZotov e4edecdd30 [se] Change formulas descriptions 2021-05-14 14:16:52 +03:00
Julia Radzhabova 4145b0a443 [SSE mobile] Fix Bug 50398 2021-05-14 13:24:54 +03:00
Maxim Kadushkin d16354f4f6 [SSE mobile] changes for prod version 2021-05-14 13:08:08 +03:00
Maxim Kadushkin 76c1e846a6 [SSE mobile] changes for prod version 2021-05-14 11:19:30 +03:00
Julia Radzhabova cb6998eac6 Fix Bug 50389. Refactoring listview. 2021-05-13 20:30:57 +03:00
JuliaSvinareva d9905d9789 [SSE mobile] Fix template of edit cell 2021-05-13 19:05:39 +03:00
JuliaSvinareva 41105c00ef [SSE mobile] Bug 48623 (Moved code from main controller, removed unused code) 2021-05-13 18:37:00 +03:00
JuliaSvinareva c36ed41d35 [SSE mobile] Fix translations 2021-05-13 18:34:30 +03:00
JuliaSvinareva 861c60caff Merge branch 'feature/mobile-apps-on-reactjs-fixes' into develop 2021-05-13 18:09:03 +03:00
Maxim Kadushkin f6648ac5fa [SSE mobile] debug production version 2021-05-13 17:15:58 +03:00
Julia Radzhabova 5c7350e28f Support rename for wopi 2021-05-12 19:04:14 +03:00
Maxim Kadushkin f900a3480b [all] extend options on desktop app launch 2021-05-12 16:41:59 +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
Maxim Kadushkin 9a0a89b077 [SSE] fix deployment for mobile app 2021-05-11 20:43:00 +03:00
Julia Radzhabova be4a444adb Fix Bug 50298 2021-05-11 15:24:53 +03:00
Julia Radzhabova 35e132ce68 [SSE] Fix Bug 50285 2021-05-11 15:00:34 +03:00
Maxim Kadushkin c4955d60fb [SSE] debug deployment 2021-05-11 13:24:45 +03:00
Maxim Kadushkin 06b42d4d6d [SSE DE] changed skeleton's stylesheet 2021-05-09 00:39:17 +03:00
Maxim Kadushkin 975554b86a [SSE] fix bug 50289 2021-05-08 23:31:33 +03:00
SergeyEzhin be110e5eff [SSE mobile] Bug 48659 2021-05-07 20:29:28 +03:00
Julia Radzhabova bb877dd34f Update translation 2021-05-07 13:08:10 +03:00
Julia Radzhabova 33c3c9c887 Update help 2021-05-07 12:37:17 +03:00
Julia Radzhabova 6360a44929 Update translation 2021-05-07 12:34:03 +03:00
Julia Radzhabova acc4cca3a0 [SSE] Fix changing char type 2021-05-06 16:43:46 +03:00
SergeyEzhin 5c6d736f9a [DE PE SSE mobile] Bug 47749 2021-05-06 15:29:19 +03:00
Julia Radzhabova c14408bd9c Fix wopi messages 2021-05-06 14:37:46 +03:00
Julia Radzhabova 0652b873cb
Merge pull request #863 from ONLYOFFICE/fix/bugfix
Fix/bugfix
2021-05-06 00:31:49 +03:00
Maxim Kadushkin 518ab99097 [SSE] fix bug 50242 2021-05-05 22:37:33 +03:00
Julia Radzhabova 766d47e7af [SSE] Fix Bug 49257 2021-05-05 19:13:21 +03:00
SergeyEzhin 0b17b27492 Bug 49336 2021-05-05 19:04:31 +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 0d491e78be [SSE] fix bug 50190 2021-05-04 20:09:24 +03:00
SergeyEzhin 5a244af7a1 [SSE mobile] Bug 48623 2021-05-04 19:40:35 +03:00
Julia Radzhabova 79a4ad4542 Update help 2021-05-04 17:26:37 +03:00
Julia Radzhabova ccfab9a859 [SSE] Fix translation 2021-05-04 16:31:50 +03:00
Julia Radzhabova c84304afd5 [SSE mobile] Fix Bug 50200 2021-05-04 15:54:38 +03:00
Julia Radzhabova f5ec7cce4d For Bug 50012 2021-05-04 15:32:26 +03:00
Julia Radzhabova 971be036f2 [SSE] Fix Bug 50175 2021-05-04 14:08:26 +03:00
Julia Radzhabova c8e5f8e086 [SSE] Fix changing chart type 2021-05-04 12:24:14 +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 dc522ea16b [SSE] Add asc_ prefix 2021-04-30 18:33:33 +03:00
Julia Radzhabova fdf9dd4ea8 [SSE] Add asc_ prefix 2021-04-30 18:30:08 +03:00
Julia Radzhabova 45aee08641 Update translation 2021-04-30 18:25:46 +03:00
Julia Radzhabova 51e4936ae7 [SSE] AscCommonExcel->Asc (Bug 50163) 2021-04-30 18:10:06 +03:00
Julia Radzhabova dfce401d8b [SSE] Update help 2021-04-30 17:41:43 +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
Maxim Kadushkin 3726a1235f [SSE mobile] refactoring 2021-04-30 15:25:28 +03:00
SergeyEzhin 024e20266d [SSE mobile] Corrected toolbar 2021-04-30 15:11:18 +03:00
JuliaSvinareva cc66831f6c [SSE mobile] Bug 50044 2021-04-30 14:58:41 +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
Julia Radzhabova 15d30ed39b Update translation 2021-04-29 20:45:25 +03:00
Julia Radzhabova ef801c5994 [SSE] Add translations 2021-04-29 20:12:12 +03:00
JuliaSvinareva 705a4f08ae [SSE mobile] Bug 50044 2021-04-29 19:25:40 +03:00
JuliaSvinareva 5e3730d416 [PE SSE mobile] Fix appOptions 2021-04-29 19:08:58 +03:00
Julia Radzhabova 09a27c30b8 For Bug 50113 2021-04-29 15:41:04 +03:00
Maxim Kadushkin 559b0292e9 [SSE PE] fix bug 49856 2021-04-28 22:56:59 +03:00
Julia Radzhabova 3dfd82cd19 [SSE] Fix Bug 50110 2021-04-28 20:00:45 +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
maxkadushkin ba6a752ec8
Merge pull request #848 from ONLYOFFICE/feature/px24-fix-bug-50024
Feature/px24 fix bug 50024
2021-04-28 14:15:46 +03:00
Maxim Kadushkin 134001162c [web-apps] fix bug 50030 2021-04-28 14:10:39 +03:00
JuliaSvinareva cc80c72411 [mobile] Fix icons 2021-04-28 12:33:15 +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
Maxim Kadushkin 1e878cd085 [SSE] fixed cell editors style for 150% scaling 2021-04-27 22:44:01 +03:00
Maxim Kadushkin 59182cfd6b [common] changed combobox caret style 2021-04-27 22:42:41 +03:00
Julia Radzhabova fc66f37f43 Change groups paddings 2021-04-27 21:21:11 +03:00
Maxim Kadushkin 461106210f [themes] changed skeleton's color 2021-04-27 20:22:21 +03:00
Maxim Kadushkin acaeec776f [SSE] fix bug 50024 2021-04-27 20:21:45 +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
ShimaginAndrey 3c97073b0e Merge branch 'feature/mobile-apps-on-reactjs' into feature/fix-bug-shimaginA 2021-04-27 15:18:14 +03:00
Julia Radzhabova 62ddbf3229 [SSE] Fix link to cell range 2021-04-26 19:11:33 +03:00
JuliaSvinareva ad5104c8c5 [mobile] Fix long actions controller 2021-04-26 18:43:12 +03:00
Julia Radzhabova 386d55d785 Fix Bug 50014 2021-04-26 17:05:45 +03:00
Julia Radzhabova e6b8a379ba Fix vulnerability 2021-04-26 14:54:55 +03:00
Maxim Kadushkin f57486d376 [themes] fix bug 50002 2021-04-26 14:31:58 +03:00
Maxim Kadushkin c4b69233e5 [all] fix bug 49886 2021-04-24 21:23:24 +03:00
Maxim Kadushkin 4533ceafd7 [all] fix bug 49741 2021-04-24 21:12:57 +03:00
JuliaSvinareva 8fb9119f01 [SSE mobile] Make main controller 2021-04-24 17:57:44 +03:00
Julia Radzhabova c12aae8a0f Update translation 2021-04-24 01:24:45 +03:00
Julia Radzhabova 235ee11403 [SSE] Fix styles 2021-04-23 16:58:50 +03:00
Julia Radzhabova be2c67be38 Fix Bug 49872 2021-04-23 16: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
Julia Radzhabova a086f9e068 [SSE] Fix macro list 2021-04-22 19:44:03 +03:00
Julia Radzhabova 28447731e6 Fix Bug 49733 2021-04-22 16:38:58 +03:00