JuliaSvinareva
|
861c60caff
|
Merge branch 'feature/mobile-apps-on-reactjs-fixes' into develop
|
2021-05-13 18:09:03 +03:00 |
|
Julia Radzhabova
|
59c658ecab
|
Wopi: change config parameters and post messages
|
2021-05-13 00:57:01 +03:00 |
|
|
Julia Radzhabova
|
f8ee00314a
|
Change file sharing by url for wopi
|
2021-05-12 22:27:57 +03:00 |
|
|
JuliaSvinareva
|
2ae18c1787
|
[mobile] Fix template of user page
|
2021-05-12 20:00:00 +03:00 |
|
|
Julia Radzhabova
|
4a383469a3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-05-12 19:04:37 +03:00 |
|
|
Julia Radzhabova
|
5c7350e28f
|
Support rename for wopi
|
2021-05-12 19:04:14 +03:00 |
|
|
JuliaSvinareva
|
ed70fe9442
|
[common] Fix error when clicking on next review in mobile
|
2021-05-12 18:59:34 +03:00 |
|
SergeyEzhin
|
acc1f43a9a
|
[common] Bug 47778
|
2021-05-07 17:34:02 +03:00 |
|
Maxim Kadushkin
|
c8c5810d1c
|
[common] extend htmlEncode function
|
2021-05-06 16:29:27 +03:00 |
|
|
SergeyEzhin
|
f6ff8b498d
|
[common] Bug 48187
|
2021-05-06 15:59:37 +03:00 |
|
|
SergeyEzhin
|
2a7812bfa3
|
[common] Bug 37524
|
2021-05-06 15:01:29 +03:00 |
|
|
Julia Radzhabova
|
c14408bd9c
|
Fix wopi messages
|
2021-05-06 14:37:46 +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 |
|
|
Julia Radzhabova
|
6eee4f8ae1
|
[Mobile] Fix plugins loading
|
2021-05-04 22:05:26 +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 |
|
|
Julia Radzhabova
|
661b937a74
|
Fix Bug 50031
|
2021-05-04 18:34: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
|
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 |
|
|
JuliaSvinareva
|
61998a2c04
|
[mobile] Add hide navbar when sheet-modal is opened
|
2021-04-30 16:29:41 +03:00 |
|
|
SergeyEzhin
|
4b0722ad91
|
[common] Correct searchbar
|
2021-04-30 16:10:30 +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
|
02b6ec8a9b
|
Merge pull request #852 from ONLYOFFICE/fix/bugfix
Fix/bugfix
|
2021-04-29 20:54:30 +03:00 |
|
|
Maxim Kadushkin
|
1244f69115
|
[common] fix bug 50136
|
2021-04-29 19:32:00 +03:00 |
|
|
Julia Radzhabova
|
663cf2afc6
|
Fix Bug 50139
|
2021-04-29 19:21:41 +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
|
09a27c30b8
|
For Bug 50113
|
2021-04-29 15:41:04 +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 |
|
|
Maxim Kadushkin
|
0739e2d588
|
[common] fix bug 50025
|
2021-04-28 15:32:20 +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
|
4080a1ab27
|
Merge branch 'feature/mobile-apps-on-reactjs-edits' into feature/mobile-apps-on-reactjs
|
2021-04-28 12:34:17 +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 |
|
|
JuliaSvinareva
|
8cdb629864
|
[mobile] Fix open context menu, when dialog is opened
|
2021-04-28 12:04:50 +03:00 |
|
|
Maxim Kadushkin
|
64031048ce
|
[themes] changed component's state opacity
|
2021-04-27 23:38:17 +03:00 |
|
|
Maxim Kadushkin
|
50a97c9152
|
[themes] fixed dropdown menu style
|
2021-04-27 23:36:29 +03:00 |
|
|
Maxim Kadushkin
|
59182cfd6b
|
[common] changed combobox caret style
|
2021-04-27 22:42:41 +03:00 |
|
|
Julia Radzhabova
|
cc41080814
|
Change paddings for huge buttons
|
2021-04-27 22:27:47 +03:00 |
|
|
Julia Radzhabova
|
fc66f37f43
|
Change groups paddings
|
2021-04-27 21:21:11 +03:00 |
|
|
Maxim Kadushkin
|
e39c23cc88
|
[common] changed active state for combobox button
|
2021-04-27 20:25:00 +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
|
160b2baf7f
|
[mobile] Fix edit comments for tablet
|
2021-04-27 15:28:25 +03:00 |
|
|
Maxim Kadushkin
|
2a75e05bfa
|
[common] fix bug 50026
|
2021-04-27 00:04:44 +03:00 |
|
|
SergeyEzhin
|
33f1cc5985
|
[common] Make plugins
|
2021-04-27 00:02:07 +03:00 |
|
|
Maxim Kadushkin
|
e6c962daf8
|
[common] fix bug 50016
|
2021-04-26 23:26:29 +03:00 |
|