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
|
45aee08641
|
Update translation
|
2021-04-30 18:25:46 +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
|
8fb2dc61d5
|
Merge branch 'feature/mobile-apps-on-reactjs-fixes' into feature/mobile-apps-on-reactjs
|
2021-04-27 11:13:33 +03:00 |
|
|
Julia Radzhabova
|
c12aae8a0f
|
Update translation
|
2021-04-24 01:24:45 +03:00 |
|
|
SergeyEzhin
|
fe34b1c3e3
|
[DE mobile] Bug 47403
|
2021-04-21 18:38:06 +03:00 |
|
|
JuliaSvinareva
|
57043e6602
|
[DE mobile] Changes related to main controller
|
2021-04-20 19:49:49 +03:00 |
|
|
JuliaSvinareva
|
89d8b3703e
|
[DE mobile] Make main controller, add run autostart macroses
|
2021-04-12 19:03:42 +03:00 |
|
|
JuliaSvinareva
|
8d6ea8f464
|
[DE mobile] Make main controller
|
2021-04-09 21:08:13 +03:00 |
|
|
JuliaSvinareva
|
904e9baf05
|
[DE mobile] Long action handler moved to a separate controller
|
2021-04-08 21:00:44 +03:00 |
|
|
JuliaSvinareva
|
3bcd2a55a7
|
[DE mobile] Add error controller
|
2021-04-08 18:34:57 +03:00 |
|
|
JuliaSvinareva
|
bc7713368a
|
[DE mobile] Add preloader for long actions
|
2021-04-07 20:15:09 +03:00 |
|
|
JuliaSvinareva
|
93152efb32
|
[DE mobile] Add apply license in main controller
|
2021-04-04 18:01:19 +03:00 |
|
|
Julia Radzhabova
|
30e02a93fc
|
Update translation
|
2021-04-02 11:39:51 +03:00 |
|
|
JuliaSvinareva
|
0283f82a4d
|
[DE mobile] Add apply mode in main controller
|
2021-04-01 23:29:56 +03:00 |
|
|
JuliaSvinareva
|
babe1233a9
|
[mobile] Add handler for try undo in fast collaborative
|
2021-04-01 23:27:58 +03:00 |
|
|
JuliaSvinareva
|
d64eae031a
|
[DE mobile] Make toolbar controller
|
2021-03-30 23:11:49 +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 |
|
|
Julia Radzhabova
|
39ddc24254
|
Update translation
|
2021-03-27 00:12:55 +03:00 |
|
|
SergeyEzhin
|
1876de1e87
|
[mobile] Corrected About
|
2021-03-26 17:48:18 +03:00 |
|
|
Julia Radzhabova
|
7c025d7967
|
Update translation
|
2021-03-19 22:08:12 +03:00 |
|
|
JuliaSvinareva
|
cb62ade641
|
[DE mobile] Add merge, split, delete, delete table, edit handler in context menu
|
2021-03-18 17:35:25 +03:00 |
|
|
SergeyEzhin
|
573d1c49c5
|
[mobile] Added About
|
2021-03-17 18:44:35 +03:00 |
|
|
JuliaSvinareva
|
c5ef8766d6
|
[DE mobile] Add cut, copy, paste handler in context menu
|
2021-03-17 11:46:57 +03:00 |
|
|
JuliaSvinareva
|
586dbd5449
|
Merge branch 'feature/mobile-apps-on-reactjs-de' into feature/mobile-apps-on-reactjs
|
2021-03-16 19:42:45 +03:00 |
|
JuliaSvinareva
|
b4bd17d0bc
|
[mobile] Add actions for more items in context menu
|
2021-03-16 16:27:47 +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 |
|
|
Maxim Kadushkin
|
d3163b0be0
|
Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-de
# Conflicts:
# apps/common/mobile/resources/less/ios/icons.less
# apps/common/mobile/resources/less/material/icons.less
|
2021-03-10 10:41:56 +03:00 |
|
|
Julia Radzhabova
|
47946f7b43
|
[DE] Fix Bug 48900
|
2021-03-09 18:03:12 +03:00 |
|
|
SergeyEzhin
|
f9ffaf6891
|
[DE mobile] Added Replace All and adding styles for phones
|
2021-03-03 22:52:16 +03:00 |
|
|
JuliaSvinareva
|
e8749b09d6
|
[mobile] Comments (edit reply)
|
2021-03-03 21:21:03 +03:00 |
|
|
SergeyEzhin
|
ed550f1dce
|
[DE mobile] Added replacing
|
2021-03-02 22:33:26 +03:00 |
|
|
JuliaSvinareva
|
37cce9d295
|
[mobile] Comments (add actions: resolve/reopen, delete comment; check canViewComments to display list of comments; change styles)
|
2021-02-28 20:47:47 +03:00 |
|
|
Julia Radzhabova
|
deae069826
|
Update translation
|
2021-02-26 17:53:24 +03:00 |
|
|
JuliaSvinareva
|
c3dd451d7a
|
[mobile] Made receiving and displaying comments into collaboration
|
2021-02-25 19:26:42 +03:00 |
|
|
Julia Radzhabova
|
01b693f9c0
|
Update translation
|
2021-02-19 18:51:58 +03:00 |
|
|
JuliaSvinareva
|
060e51b47a
|
[DE mobile] Refactoring review (remove html tags from translations, create array of elements instead of string)
|
2021-02-19 12:22:10 +03:00 |
|
|
JuliaSvinareva
|
c446eb4db4
|
[mobile][de] Add insert comment
|
2021-02-18 18:40:54 +03:00 |
|
|
JuliaSvinareva
|
4e8be323a8
|
[DE mobile] Add review settings
|
2021-02-12 20:33:38 +03:00 |
|
|
JuliaSvinareva
|
c3437aa762
|
[DE mobile] Add review settings
|
2021-02-12 02:34:01 +03:00 |
|
|
JuliaSvinareva
|
3912fe4620
|
[mobile] Edit collaboration
|
2021-02-08 19:32:25 +03:00 |
|
|
Julia Radzhabova
|
a79e733de4
|
Update translation
|
2021-02-05 16:34:50 +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 |
|
|
Julia Radzhabova
|
f9b17e98c8
|
Update translation
|
2021-01-23 00:41:17 +03:00 |
|
|
JuliaSvinareva
|
8fbb7f75ec
|
[DE mobile] Added the ability to insert footnote
|
2021-01-22 21:35:55 +03:00 |
|
|
JuliaSvinareva
|
6cc5bae310
|
[DE mobile] Added the ability to insert break
|
2021-01-22 14:33:00 +03:00 |
|