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

7849 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julia Radzhabova 66685239ae Refactoring 2021-05-07 01:05:26 +03:00
Julia Radzhabova 8429cab65b Support review parameter for wopi 2021-05-07 00:26:42 +03:00
Maxim Kadushkin 3b517bdc49 [PE] fix build config 2021-05-06 17:33:13 +03:00
maxkadushkin 0949cce8a8
Merge pull request #865 from ONLYOFFICE/feature/fix-utils-html-encode 
[common] extend htmlEncode function
 2021-05-06 16:44:52 +03:00
Maxim Kadushkin c8c5810d1c [common] extend htmlEncode function 2021-05-06 16:29:27 +03:00
Julia Radzhabova c14408bd9c Fix wopi messages 2021-05-06 14:37:46 +03:00
Maxim Kadushkin 9a1c2a0b91 [mobile] fix build script 2021-05-06 14:14:51 +03:00
Maxim Kadushkin 295bc949c9 Merge branch 'feature/fix-bug-shimaginA' into develop 2021-05-05 00:31:01 +03:00
Maxim Kadushkin 9693ced4c0 Merge branch 'feature/mobile-apps-on-reactjs-pe-bug50044' into develop 2021-05-05 00:12:41 +03:00
Julia Radzhabova 6eee4f8ae1 [Mobile] Fix plugins loading 2021-05-04 22:05:26 +03:00
Julia Radzhabova 661b937a74 Fix Bug 50031 2021-05-04 18:34:52 +03:00
Julia Radzhabova c84304afd5 [SSE mobile] Fix Bug 50200 2021-05-04 15:54:38 +03:00
Julia Radzhabova 96d6be31bc [DE] Fix Bug 50191 2021-05-04 14:24:28 +03:00
SergeyEzhin 5e70754a55 [PE mobile] Corrected buttons for android 2021-05-04 14:12:00 +03:00
SergeyEzhin 3a1c2ca2a2 [PE mobile] Corrected bug in EditText and correct bug 50044 2021-05-04 01:43:10 +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
JuliaSvinareva 61998a2c04 [mobile] Add hide navbar when sheet-modal is opened 2021-04-30 16:29:41 +03:00
Maxim Kadushkin 537498e8c1 Merge branch 'feature/mobile-apps-on-reactjs-edits' into feature/mobile-apps-on-reactjs 2021-04-30 16:21:15 +03:00
SergeyEzhin 374acddf54 Merge branch 'feature/mobile-apps-on-reactjs-edits' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs-edits 2021-04-30 16:11:45 +03:00
SergeyEzhin 4b0722ad91 [common] Correct searchbar 2021-04-30 16:10:30 +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
Julia Radzhabova 5c8114626a Fix wopi config 2021-04-30 13:06:42 +03:00
SergeyEzhin d7fe83da9f [DE mobile] Corrected icon-search 2021-04-30 11:51:57 +03:00
Julia Radzhabova bce63ab546 Send wopi messages 2021-04-30 02:24:02 +03:00
SergeyEzhin 45b0cb2bac [common] Edits toolbar and corrected searchbar 2021-04-30 01:18:03 +03:00
Julia Radzhabova 40d535fa4c Fix merge 2021-04-30 00:07:29 +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
Maxim Kadushkin 0ba574b9cf Merge branch 'feature/mobile-apps-on-reactjs-deployment' into feature/mobile-apps-on-reactjs 2021-04-29 21:05:15 +03:00
Julia Radzhabova 02b6ec8a9b
Merge pull request #852 from ONLYOFFICE/fix/bugfix 
Fix/bugfix
 2021-04-29 20:54:30 +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
Maxim Kadushkin 1244f69115 [common] fix bug 50136 2021-04-29 19:32:00 +03:00
JuliaSvinareva 705a4f08ae [SSE mobile] Bug 50044 2021-04-29 19:25:40 +03:00
Julia Radzhabova 663cf2afc6 Fix Bug 50139 2021-04-29 19:21:41 +03:00
JuliaSvinareva 5e3730d416 [PE SSE mobile] Fix appOptions 2021-04-29 19:08:58 +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
Julia Radzhabova 276f068e8f
Merge pull request #851 from ONLYOFFICE/fix/bug-50113 
Fix/bug 50113
 2021-04-29 16:42:05 +03:00
Julia Radzhabova 2ef1c936e9 [DE][PE] Fix translation 2021-04-29 16:06:47 +03:00
Julia Radzhabova 09a27c30b8 For Bug 50113 2021-04-29 15:41:04 +03:00
Julia Radzhabova a12aca655e [DE] Fix Bug 50130 2021-04-29 15:10:57 +03:00
JuliaSvinareva 5832ba5551 [DE mobile] Bug 50044 2021-04-29 14:42:44 +03:00