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 |
|
|
ShimaginAndrey
|
10927e6f63
|
Filter Options
|
2021-05-23 18:27:21 +03:00 |
|
Julia Radzhabova
|
f7ad092d81
|
Change comment groups: show comment replys from all users group if comment is visible for current user group
|
2021-05-18 15:18:58 +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 |
|
|
SergeyEzhin
|
d55aad76ac
|
Bug 49157
|
2021-05-05 16:06:07 +03:00 |
|
Maxim Kadushkin
|
295bc949c9
|
Merge branch 'feature/fix-bug-shimaginA' into develop
|
2021-05-05 00:31:01 +03:00 |
|
|
Julia Radzhabova
|
6eee4f8ae1
|
[Mobile] Fix plugins loading
|
2021-05-04 22:05:26 +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
|
8cdb629864
|
[mobile] Fix open context menu, when dialog is opened
|
2021-04-28 12:04:50 +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 |
|
|
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 |
|
|
SergeyEzhin
|
33f1cc5985
|
[common] Make plugins
|
2021-04-27 00:02:07 +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 |
|
|
Julia Radzhabova
|
c2e0ffb2be
|
Merge branch 'release/v6.3.0' into develop
|
2021-04-15 11:18:07 +03:00 |
|
|
JuliaSvinareva
|
eb6a25140d
|
[DE mobile] Add check to hide review in collaboration
|
2021-04-13 18:23:37 +03:00 |
|
|
Maxim Kadushkin
|
a9dda7fe6f
|
[common] don't open context menu if no items
|
2021-04-12 18:10:03 +03:00 |
|
|
Julia Radzhabova
|
49eba78cbc
|
Set plugin version
|
2021-04-06 21:25:24 +03:00 |
|
|
JuliaSvinareva
|
93152efb32
|
[DE mobile] Add apply license in main controller
|
2021-04-04 18:01:19 +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 |
|
|
SergeyEzhin
|
dd3b5fafe0
|
[SSE mobile] Corrected some things
|
2021-03-30 17:51:53 +03:00 |
|
|
Julia Radzhabova
|
b1d3ba3fc0
|
Merge branch 'release/v6.3.0' into develop
|
2021-03-29 16:33:45 +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
|
78229a2bab
|
Merge branch 'develop' into feature/comment-permissions
|
2021-03-28 22:18:19 +03:00 |
|
|
Julia Radzhabova
|
7092ae1cbc
|
[Mobile] Fix plugins loading
|
2021-03-27 22:53:36 +03:00 |
|
|
Julia Radzhabova
|
cc3df7db90
|
[DE mobile] Fix review permissions
|
2021-03-26 20:54:38 +03:00 |
|
|
Julia Radzhabova
|
0b2a3aec7e
|
Add event onPluginsReady
|
2021-03-26 20:37:29 +03:00 |
|
|
Julia Radzhabova
|
2a6ed8f973
|
[DE] Fix review groups
|
2021-03-26 20:32:25 +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 |
|