Julia Radzhabova
|
45d7980212
|
Merge branch 'release/v6.3.0' into develop
|
2021-05-21 12:28:54 +03:00 |
|
|
Julia Radzhabova
|
d7d387c27a
|
Update translation
|
2021-05-14 15:02:42 +03:00 |
|
|
Julia Radzhabova
|
6360a44929
|
Update translation
|
2021-05-07 12:34:03 +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
|
7fb36f66f1
|
Update translation. Fix Bug 50049, Fix Bug 50061
|
2021-04-30 16:28:59 +03:00 |
|
SergeyEzhin
|
45b0cb2bac
|
[common] Edits toolbar and corrected searchbar
|
2021-04-30 01:18:03 +03:00 |
|
|
SergeyEzhin
|
072f84a27c
|
[DE PE SSE mobile] Corrected display collaboration
|
2021-04-28 01:15:16 +03:00 |
|
JuliaSvinareva
|
ad5104c8c5
|
[mobile] Fix long actions controller
|
2021-04-26 18:43:12 +03:00 |
|
|
Julia Radzhabova
|
c12aae8a0f
|
Update translation
|
2021-04-24 01:24:45 +03:00 |
|
|
Julia Radzhabova
|
be9918cfa3
|
Update translation
|
2021-04-23 16:24:35 +03:00 |
|
|
JuliaSvinareva
|
26523317e7
|
[PE mobile] Add translations
|
2021-04-21 21:03:14 +03:00 |
|
|
JuliaSvinareva
|
eb63c42891
|
[PE mobile] Make main controller, add error controller, add controller for long actions
|
2021-04-20 19:52:36 +03:00 |
|
|
SergeyEzhin
|
1466cd61e4
|
[PE mobile] Added preview slides
|
2021-04-16 17:03:28 +03:00 |
|
|
JuliaSvinareva
|
92520c0e13
|
Merge branch 'feature/mobile-apps-on-reactjs-fixes' into feature/mobile-apps-on-reactjs
|
2021-04-15 13:26:46 +03:00 |
|
|
Julia Radzhabova
|
30e02a93fc
|
Update translation
|
2021-04-02 11:39:51 +03:00 |
|
|
JuliaSvinareva
|
babe1233a9
|
[mobile] Add handler for try undo in fast collaborative
|
2021-04-01 23:27:58 +03:00 |
|
|
SergeyEzhin
|
0bbd65fadd
|
[PE mobile] Bug 47909, Bug 48110
|
2021-04-01 18:50:48 +03:00 |
|
|
JuliaSvinareva
|
f9f53e6dfc
|
Merge branch 'feature/mobile-apps-on-reactjs-about' into feature/mobile-apps-on-reactjs
|
2021-03-29 13:38:22 +03:00 |
|
|
SergeyEzhin
|
1876de1e87
|
[mobile] Corrected About
|
2021-03-26 17:48:18 +03:00 |
|
|
JuliaSvinareva
|
4b0ec3e352
|
[PE mobile] Add context menu
|
2021-03-23 14:05:45 +03:00 |
|
|
JuliaSvinareva
|
7fb9407ef6
|
[PE mobile] Add checking of hide insert comment, connecting comment components
|
2021-03-22 14:35:16 +03:00 |
|
|
Julia Radzhabova
|
7c025d7967
|
Update translation
|
2021-03-19 22:08:12 +03:00 |
|
|
SergeyEzhin
|
573d1c49c5
|
[mobile] Added About
|
2021-03-17 18:44:35 +03:00 |
|
|
SergeyEzhin
|
32f5bd693e
|
[DE PE mobile] Correcting Find and Replace
|
2021-03-15 21:35:19 +03:00 |
|
|
Julia Radzhabova
|
d8a5e8244a
|
Update translation
|
2021-03-12 20:53:03 +03:00 |
|
|
SergeyEzhin
|
de79f6e526
|
[PE mobile] Added Find and Replace
|
2021-03-10 19:51:22 +03:00 |
|
|
Julia Radzhabova
|
deae069826
|
Update translation
|
2021-02-26 17:53:24 +03:00 |
|
|
Julia Radzhabova
|
01b693f9c0
|
Update translation
|
2021-02-19 18:51:58 +03:00 |
|
|
Julia Radzhabova
|
a79e733de4
|
Update translation
|
2021-02-05 16:34:50 +03:00 |
|
|
JuliaSvinareva
|
4f3bf2729c
|
Merge branch 'feature/mobile-apps-on-reactjs-pe-edit-settings' into feature/mobile-apps-on-reactjs
|
2021-02-03 23:56:08 +03:00 |
|
|
Julia Radzhabova
|
7272ebad10
|
Update translation
|
2021-02-02 18:36:37 +03:00 |
|
|
JuliaSvinareva
|
9d743bd814
|
[DE PE mobile] Hide styles for combined charts
|
2021-02-01 20:34:07 +03:00 |
|
|
SergeyEzhin
|
f9e91266a5
|
[PE mobile] Make Link Settings
|
2021-01-29 22:52:14 +03:00 |
|
|
SergeyEzhin
|
2c6c3c3a71
|
[PE mobile] Corrected conflict
|
2021-01-29 11:57:14 +03:00 |
|
|
JuliaSvinareva
|
6998771d0c
|
[PE mobile] Added the ability insert links
|
2021-01-29 00:30:33 +03:00 |
|
|
SergeyEzhin
|
020126898a
|
[PE mobile] Added Chart Settings and small edits
|
2021-01-28 18:07:00 +03:00 |
|
|
SergeyEzhin
|
91bc43ca8c
|
[PE mobile] Added Table Settings
|
2021-01-27 18:09:56 +03:00 |
|
|
JuliaSvinareva
|
89eff1f6b8
|
[PE mobile] Added the ability to insert tables
|
2021-01-26 20:09:40 +03:00 |
|
|
JuliaSvinareva
|
6306262018
|
[PE mobile] Added the ability to insert images
|
2021-01-26 15:50:09 +03:00 |
|
|
SergeyEzhin
|
1e5a3ddc75
|
[PE mobile] Added Image Settings
|
2021-01-25 22:02:49 +03:00 |
|
|
Julia Radzhabova
|
f9b17e98c8
|
Update translation
|
2021-01-23 00:41:17 +03:00 |
|
|
SergeyEzhin
|
80a874ad21
|
[PE mobile] Make Shape Settings
|
2021-01-21 22:05:02 +03:00 |
|
|
SergeyEzhin
|
4b0b0478ad
|
[PE mobile] Maked Text Settings
|
2021-01-19 20:34:11 +03:00 |
|
|
Julia Radzhabova
|
e8eba05a54
|
Merge branch 'release/v6.2.0' into develop
|
2021-01-19 18:05:55 +03:00 |
|
|
SergeyEzhin
|
79da854961
|
[PE mobile] Make Text Settings
|
2021-01-18 21:03:39 +03:00 |
|
|
Julia Radzhabova
|
380a5cba92
|
Update translation
|
2021-01-18 19:08:41 +03:00 |
|
|
Julia Radzhabova
|
0bf41fbee2
|
Update translation
Fix Bug 48205, Bug 43454
|
2021-01-18 17:57:14 +03:00 |
|
|
JuliaSvinareva
|
3dad63735f
|
Merge branch 'feature/mobile-apps-on-reactjs-pe-edit-settings' into feature/mobile-apps-on-reactjs
|
2021-01-18 11:56:59 +03:00 |
|
|
SergeyEzhin
|
26a4e263cb
|
[PE mobile] Refactoring Slide Settings, added duplicates and remove slides
|
2021-01-15 19:04:19 +03:00 |
|
|
SergeyEzhin
|
923cb7f3f5
|
[PE mobile] Maked Style Settings
|
2021-01-14 17:02:36 +03:00 |
|