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 |
|
SergeyEzhin
|
1cb18ade25
|
[SSE mobile] Corrected Text Settings and Chart Settings
|
2021-02-17 14:28:02 +03:00 |
|
|
SergeyEzhin
|
9e80ead4b4
|
[SSE mobile] Added Text Settings
|
2021-02-09 21:42:00 +03:00 |
|
JuliaSvinareva
|
eb5b8e7973
|
[common mobile] Added check for existence of current color into Custom color component
|
2021-01-12 20:19:16 +03:00 |
|
|
JuliaSvinareva
|
d089a266b0
|
[common mobile] Fixed init transparent color into CustomColorPicker component
|
2021-01-12 16:43:56 +03:00 |
|
|
JuliaSvinareva
|
717bc84804
|
[common mobile] Fixed theme color palette
|
2021-01-12 16:29:56 +03:00 |
|
|
JuliaSvinareva
|
d15e3ae6a9
|
[mobile] Fixed auto color in palette, fixed styles
|
2020-12-29 20:18:08 +03:00 |
|
|
JuliaSvinareva
|
25150e6f36
|
Merge branch 'feature/mobile-apps-on-reactjs' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs
|
2020-12-28 23:13:34 +03:00 |
|
|
JuliaSvinareva
|
355d2535f4
|
[mobile common] Added custom color picker
|
2020-12-28 23:02:43 +03:00 |
|
|
Maxim Kadushkin
|
c60cc871c0
|
[DE] fix open palette console error
|
2020-12-27 16:27:38 +03:00 |
|
|
JuliaSvinareva
|
122d4b16fe
|
[common] Added ThemeColorPalette component
|
2020-12-23 21:00:59 +03:00 |
|
Julia Radzhabova
|
2872f42cc3
|
Fix Bug 46996
|
2020-10-28 16:53:28 +03:00 |
|
|
Julia Radzhabova
|
e87bac346d
|
Fix Bug 46996
|
2020-10-21 12:47:11 +03:00 |
|
|
Julia Svinareva
|
163e0e26dc
|
[mobile] Custom color (add border, add translations)
|
2019-10-17 13:09:58 +03:00 |
|
|
Julia Svinareva
|
99affc5cfd
|
[SSE] Custom Color (Edit Cell)
|
2019-10-09 14:24:26 +03:00 |
|
|
Julia Svinareva
|
bf25a21455
|
[DE mobile] Custom Color
|
2019-10-07 17:42:36 +03:00 |
|
|
Julia Svinareva
|
3f97b8af79
|
[DE mobile] Custom Color (shape fill, border color)
|
2019-10-07 10:15:35 +03:00 |
|
|
Julia Svinareva
|
7b11701a7b
|
[Common mobile] Custom Color
|
2019-10-04 15:12:57 +03:00 |
|
|
Julia Svinareva
|
cf14768482
|
[Common mobile] Custom Color
|
2019-10-03 13:40:56 +03:00 |
|
|
Julia Svinareva
|
defd8e7edb
|
[Common mobile] Custom Color
|
2019-09-27 16:41:19 +03:00 |
|
Alexander.Trofimov
|
c10009a464
|
[copyright] Update Copyright
Limited -> SIA
|
2019-01-17 16:05:03 +03:00 |
|
|
Alexander.Trofimov
|
68a1691d28
|
[copyright] For bug 39644
Change address Latvian office.
|
2019-01-17 16:00:34 +03:00 |
|
|
Alexander.Trofimov
|
1c9e684698
|
[copyright] Update Copyright
2018 -> 2019
|
2019-01-17 15:58:05 +03:00 |
|
Pavel Lobashov
|
06da18bf2d
|
Update copyright to 2018
|
2018-03-01 15:16:38 +03:00 |
|
|
Julia Radzhabova
|
f1280d2670
|
[DE mobile][PE][SSE] Merge from develop.
|
2017-04-11 14:05:56 +03:00 |
|
|
Julia Radzhabova
|
7a12d8c390
|
[mobile] Bug with theme color component (when color contains only digits).
|
2016-11-30 15:44:46 +03:00 |
|
Alexander Yuzhin
|
cb49944b8c
|
[mobile] Remove old common.
|
2016-11-28 12:51:40 +03:00 |
|
|
Alexander Yuzhin
|
9e9e738dbd
|
[DE mobile] Localization EditText, ThemeColorPalette.
|
2016-11-21 12:58:57 +03:00 |
|
|
Alexander Yuzhin
|
25e20d4877
|
[DE mobile] Update document editor mobile.
|
2016-11-11 16:24:21 +03:00 |
|
|
Alexander Yuzhin
|
66f4cc1086
|
Fixed mobile editors
|
2016-09-14 15:04:28 +03:00 |
|
|
Maxim Kadushkin
|
1bd7d37f93
|
license info added to js
|
2016-04-01 16:17:09 +03:00 |
|
|
Maxim Kadushkin
|
741b10515d
|
webapps added
|
2016-03-10 21:48:53 -03:00 |
|