SergeyEzhin
|
27dc6495a4
|
[PE mobile] Bug 47978
|
2021-05-31 18:08:02 +03:00 |
|
SergeyEzhin
|
c254f2c93a
|
Corrected replace all
|
2021-05-27 15:41:15 +03:00 |
|
JuliaSvinareva
|
642f72f182
|
Merge branch 'feature/fix-bug-shimaginA' into develop
|
2021-05-25 18:01:22 +03:00 |
|
ShimaginAndrey
|
7e74d486f6
|
Fix Bug 47237 modification v4
|
2021-05-25 16:46:24 +03:00 |
|
ShimaginAndrey
|
1850ecfdca
|
Fix Bug 47237 modification v3
|
2021-05-25 12:07:02 +03:00 |
|
ShimaginAndrey
|
14220fe977
|
Fix Bug 47237 modification v2
|
2021-05-24 16:41:31 +03:00 |
|
ShimaginAndrey
|
4355f29cfc
|
Merge branch 'feature/mobile-apps-on-reactjs' into feature/fix-bug-shimaginA
# Conflicts:
# build/package.json
|
2021-05-24 10:58:40 +03:00 |
|
JuliaSvinareva
|
537f007461
|
[mobile] Fix view comment for tablet
|
2021-05-17 19:51:12 +03:00 |
|
JuliaSvinareva
|
383620fbc7
|
[DE mobile] Fix templates
|
2021-05-17 16:14:41 +03:00 |
|
JuliaSvinareva
|
7e7ce909ac
|
[mobile] Fix users into collaboration
|
2021-05-14 14:03:06 +03:00 |
|
JuliaSvinareva
|
861c60caff
|
Merge branch 'feature/mobile-apps-on-reactjs-fixes' into develop
|
2021-05-13 18:09:03 +03:00 |
|
JuliaSvinareva
|
2ae18c1787
|
[mobile] Fix template of user page
|
2021-05-12 20:00:00 +03:00 |
|
SergeyEzhin
|
acc1f43a9a
|
[common] Bug 47778
|
2021-05-07 17:34:02 +03:00 |
|
SergeyEzhin
|
2a7812bfa3
|
[common] Bug 37524
|
2021-05-06 15:01:29 +03:00 |
|
Maxim Kadushkin
|
295bc949c9
|
Merge branch 'feature/fix-bug-shimaginA' into develop
|
2021-05-05 00:31:01 +03:00 |
|
Maxim Kadushkin
|
fdda540c47
|
[all] fix loading sdk scripts
|
2021-05-03 20:02:21 +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 |
|
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 |
|
JuliaSvinareva
|
160b2baf7f
|
[mobile] Fix edit comments for tablet
|
2021-04-27 15:28:25 +03:00 |
|
ShimaginAndrey
|
3c97073b0e
|
Merge branch 'feature/mobile-apps-on-reactjs' into feature/fix-bug-shimaginA
|
2021-04-27 15:18:14 +03:00 |
|
ShimaginAndrey
|
bacd0b5423
|
Fix Bug 47237 modification
|
2021-04-26 09:20:52 +03:00 |
|
ShimaginAndrey
|
c6b68ab7c6
|
Fix Bug 47237
|
2021-04-21 14:46:02 +03:00 |
|
Maxim Kadushkin
|
3dd26e178b
|
[common] switch off version compare for debug
|
2021-04-20 12:47:57 +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 |
|
JuliaSvinareva
|
eb6a25140d
|
[DE mobile] Add check to hide review in collaboration
|
2021-04-13 18:23:37 +03:00 |
|
JuliaSvinareva
|
93152efb32
|
[DE mobile] Add apply license in main controller
|
2021-04-04 18:01:19 +03:00 |
|
SergeyEzhin
|
dd3b5fafe0
|
[SSE mobile] Corrected some things
|
2021-03-30 17:51:53 +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
|
465fd40004
|
[SSE mobile] Fix comments
|
2021-03-26 16:23:17 +03:00 |
|
Julia Radzhabova
|
3b901f91e4
|
Use sdk class
|
2021-03-26 14:29:16 +03:00 |
|
JuliaSvinareva
|
56e316738e
|
[SSE mobile] Add comments
|
2021-03-25 01:07:10 +03:00 |
|
JuliaSvinareva
|
4b0ec3e352
|
[PE mobile] Add context menu
|
2021-03-23 14:05:45 +03:00 |
|
Julia Radzhabova
|
916c911ac7
|
[Mobile] Use config permssions to view comments
|
2021-03-17 23:57:54 +03:00 |
|
JuliaSvinareva
|
4687d2b127
|
[DE mobile] Add review, review change handler in context menu
|
2021-03-17 21:57:52 +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
|
fd561f3687
|
Merge branch 'feature/mobile-apps-on-reactjs-se-edit-settings' into feature/mobile-apps-on-reactjs
|
2021-03-16 20:49:55 +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 |
|
SergeyEzhin
|
0fa56cd60b
|
[SSE mobile] Corrected stores according to mobx v. 6
|
2021-03-15 16:39:45 +03:00 |
|
SergeyEzhin
|
a556f4e196
|
[SSE mobile] Correcting Find and Replace
|
2021-03-12 20:54:11 +03:00 |
|
JuliaSvinareva
|
299db5fcb6
|
[mobile] Make view current comments (fix on tablet, add reply, prev and next comment, add styles)
|
2021-03-11 23:38:53 +03:00 |
|
SergeyEzhin
|
99fc32bf99
|
[SSE mobile] Added Find and Replace
|
2021-03-11 20:21:55 +03:00 |
|
JuliaSvinareva
|
f5d48e6492
|
[mobile] Make view current comments, fixed change comment
|
2021-03-10 21:08:59 +03:00 |
|
SergeyEzhin
|
5d06b05a51
|
Merge branch 'feature/mobile-apps-on-reactjs-de' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs-de
|
2021-03-10 19:51:56 +03:00 |
|
SergeyEzhin
|
de79f6e526
|
[PE mobile] Added Find and Replace
|
2021-03-10 19:51:22 +03:00 |
|
Maxim Kadushkin
|
bb6172015c
|
[common mobile] fixes for mobx ver 6
|
2021-03-10 16:58:14 +03:00 |
|