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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
JuliaSvinareva
|
588a7f0386
|
[SSE mobile] Moved edit functions of context menu to private branch
|
2021-04-22 13:54:26 +03:00 |
|
|
maxkadushkin
|
0caa949644
|
Merge pull request #827 from ONLYOFFICE/feature/classic-light-theme
Feature/classic light theme
|
2021-04-22 12:54:33 +03:00 |
|
|
Julia Radzhabova
|
6f853a7c1f
|
[SSE] Fix Bug 49805
|
2021-04-21 23:27:37 +03:00 |
|
|
JuliaSvinareva
|
cfbb8ce795
|
[SSE mobile] Add toolbar, add logo
|
2021-04-21 21:04:52 +03:00 |
|
|
JuliaSvinareva
|
7c72e8cb1b
|
[SSE mobile] Changes for code decomposition
|
2021-04-21 16:32:30 +03:00 |
|
|
Julia Radzhabova
|
67499c5d21
|
Fix Bug 34613, Fix Bug 16000
|
2021-04-20 18:46:41 +03:00 |
|
|
Maxim Kadushkin
|
21ae480d3e
|
[common] refactoring
|
2021-04-19 23:58:59 +03:00 |
|
|
Maxim Kadushkin
|
ba31d2f163
|
[common] fix bug 49731
|
2021-04-19 23:57:54 +03:00 |
|
|
Julia Radzhabova
|
a910082c4c
|
[SSE mobile] Fix Bug 49728
|
2021-04-19 20:11:09 +03:00 |
|
|
Julia Radzhabova
|
98cb252112
|
Fix combobox styles
|
2021-04-19 15:48:26 +03:00 |
|