JuliaSvinareva
|
3382d2f373
|
Merge branch 'feature/develop-fixes' into develop
|
2021-05-31 16:29:18 +03:00 |
|
SergeyEzhin
|
e9eb6fceda
|
[DE PE SSE mobile] Corrected buttons
|
2021-05-30 16:34:15 +03:00 |
|
|
SergeyEzhin
|
c43062883b
|
[PE mobile] Correct navbars
|
2021-05-29 20:40:36 +03:00 |
|
Maxim Kadushkin
|
d3854c0571
|
[all] added colors table
|
2021-05-28 17:07:19 +03:00 |
|
|
SergeyEzhin
|
9888430691
|
[DE PE SSE mobile] Bug 48861
|
2021-05-28 12:18:26 +03:00 |
|
|
SergeyEzhin
|
c254f2c93a
|
Corrected replace all
|
2021-05-27 15:41:15 +03:00 |
|
|
SergeyEzhin
|
dcfc625408
|
[PE mobile] Corrected navbars in EditShape
|
2021-05-27 14:46:53 +03:00 |
|
|
JuliaSvinareva
|
5c51353d23
|
Merge branch 'feature/develop-fixes' into develop
|
2021-05-27 12:58:19 +03:00 |
|
ShimaginAndrey
|
c51221e46e
|
Fix Bug 48186 addition
|
2021-05-26 20:25:04 +03:00 |
|
Julia Radzhabova
|
61da979330
|
Set put_IsAnonymousUser
|
2021-05-25 16:57:56 +03:00 |
|
|
Julia Radzhabova
|
d99ad6b1fc
|
Save user id for anonymous user (when user.id is undefined).
[Mobile] Fix loading name for guest user
|
2021-05-25 16:39:12 +03:00 |
|
|
SergeyEzhin
|
1cce447301
|
[DE PE SSE mobile] Bug 50406
|
2021-05-21 16:37:50 +03:00 |
|
|
Julia Radzhabova
|
45d7980212
|
Merge branch 'release/v6.3.0' into develop
|
2021-05-21 12:28:54 +03:00 |
|
|
JuliaSvinareva
|
e24fa28ff6
|
[mobile] Make long actions
|
2021-05-17 15:36:00 +03:00 |
|
|
JuliaSvinareva
|
2355a62aa7
|
[PE mobile] Fix toolbar
|
2021-05-17 14:43:08 +03:00 |
|
|
JuliaSvinareva
|
89b98477bf
|
[PE mobile] Add skeleton
|
2021-05-17 13:51:50 +03:00 |
|
|
Julia Radzhabova
|
d7d387c27a
|
Update translation
|
2021-05-14 15:02:42 +03:00 |
|
|
JuliaSvinareva
|
861c60caff
|
Merge branch 'feature/mobile-apps-on-reactjs-fixes' into develop
|
2021-05-13 18:09:03 +03:00 |
|
|
JuliaSvinareva
|
bd08e74547
|
[mobile] Fix collaboration display
|
2021-05-12 14:27:03 +03:00 |
|
|
Maxim Kadushkin
|
486afef46d
|
[all] debug deployment
|
2021-05-12 13:44:17 +03:00 |
|
|
JuliaSvinareva
|
cc7d9acfaa
|
[DE PE mobile] Bug 50044
|
2021-05-11 18:52:36 +03:00 |
|
|
Julia Radzhabova
|
6360a44929
|
Update translation
|
2021-05-07 12:34:03 +03:00 |
|
|
SergeyEzhin
|
5c6d736f9a
|
[DE PE SSE mobile] Bug 47749
|
2021-05-06 15:29:19 +03:00 |
|
|
SergeyEzhin
|
0b17b27492
|
Bug 49336
|
2021-05-05 19:04:31 +03:00 |
|
|
Maxim Kadushkin
|
295bc949c9
|
Merge branch 'feature/fix-bug-shimaginA' into develop
|
2021-05-05 00:31:01 +03:00 |
|
|
Maxim Kadushkin
|
9693ced4c0
|
Merge branch 'feature/mobile-apps-on-reactjs-pe-bug50044' into develop
|
2021-05-05 00:12:41 +03:00 |
|
|
SergeyEzhin
|
6f328beca6
|
Merge branch 'feature/mobile-apps-on-reactjs-pe-bug50044' into feature/mobile-apps-on-reactjs-fixes
|
2021-05-04 21:07:52 +03:00 |
|
|
SergeyEzhin
|
5e70754a55
|
[PE mobile] Corrected buttons for android
|
2021-05-04 14:12:00 +03:00 |
|
|
SergeyEzhin
|
3a1c2ca2a2
|
[PE mobile] Corrected bug in EditText and correct bug 50044
|
2021-05-04 01:43:10 +03:00 |
|
|
Maxim Kadushkin
|
fdda540c47
|
[all] fix loading sdk scripts
|
2021-05-03 20:02:21 +03:00 |
|
|
JuliaSvinareva
|
7bb9cc90ab
|
Merge branch 'feature/mobile-apps-on-reactjs-bug50044' into develop
|
2021-05-01 18:41:17 +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 |
|
|
JuliaSvinareva
|
61998a2c04
|
[mobile] Add hide navbar when sheet-modal is opened
|
2021-04-30 16:29:41 +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 |
|
|
JuliaSvinareva
|
5e3730d416
|
[PE SSE mobile] Fix appOptions
|
2021-04-29 19:08:58 +03:00 |
|
|
SergeyEzhin
|
4f6251fcbc
|
Merge branch 'feature/mobile-apps-on-reactjs-edits' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs-edits
|
2021-04-28 17:17:35 +03:00 |
|
|
SergeyEzhin
|
79cc895ea7
|
[DE PE mobile] Correct text settings and styles
|
2021-04-28 16:35:35 +03:00 |
|
|
JuliaSvinareva
|
cc80c72411
|
[mobile] Fix icons
|
2021-04-28 12:33:15 +03:00 |
|
|
SergeyEzhin
|
141cd15ab6
|
[DE PE SSE mobile] Moved icon-collaboration
|
2021-04-28 12:19:09 +03:00 |
|
|
SergeyEzhin
|
072f84a27c
|
[DE PE SSE mobile] Corrected display collaboration
|
2021-04-28 01:15:16 +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
|
8fb2dc61d5
|
Merge branch 'feature/mobile-apps-on-reactjs-fixes' into feature/mobile-apps-on-reactjs
|
2021-04-27 11:13:33 +03:00 |
|
|
SergeyEzhin
|
33f1cc5985
|
[common] Make plugins
|
2021-04-27 00:02:07 +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
|
d66852e540
|
[DE PE mobile] Refactoring long actions controller
|
2021-04-22 21:55:57 +03:00 |
|
|
SergeyEzhin
|
a490e8e239
|
[PE mobile] Bug 46990
|
2021-04-22 17:45:16 +03:00 |
|
|
JuliaSvinareva
|
26523317e7
|
[PE mobile] Add translations
|
2021-04-21 21:03:14 +03:00 |
|
|
ShimaginAndrey
|
62fe865699
|
Fix Bug №47943
|
2021-04-21 14:23:51 +03:00 |
|
|
ShimaginAndrey
|
9b16457b17
|
Fix Bug №48073
|
2021-04-21 12:44:29 +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
|
87c46dc9cc
|
Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-fixes
|
2021-04-20 18:00:50 +03:00 |
|
|
SergeyEzhin
|
96dcabf069
|
[PE mobile] Bug 47200
|
2021-04-20 15:43:01 +03:00 |
|
|
SergeyEzhin
|
34098fc67f
|
[PE mobile] Bug 47906
|
2021-04-20 14:22:17 +03:00 |
|
|
JuliaSvinareva
|
1a2dca4872
|
Merge branch 'feature/mobile-apps-on-reactjs-preview' into feature/mobile-apps-on-reactjs
|
2021-04-19 19:24:21 +03:00 |
|
|
SergeyEzhin
|
c7b2a9813d
|
[PE mobile] Refactoring preview
|
2021-04-19 19:09:15 +03:00 |
|
|
JuliaSvinareva
|
45a9058da4
|
[DE PE mobile] Changes for private branch
|
2021-04-16 19:03:30 +03:00 |
|
|
SergeyEzhin
|
1466cd61e4
|
[PE mobile] Added preview slides
|
2021-04-16 17:03:28 +03:00 |
|
|
JuliaSvinareva
|
fe1a9e16d3
|
[PE mobile] Changes for private branch
|
2021-04-16 13:34:05 +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
|
8912a1feab
|
[PE mobile] Add files for preview
|
2021-04-15 13:06:10 +03:00 |
|
|
JuliaSvinareva
|
0277ac9306
|
[PE mobile] Add toolbar, add logo
|
2021-04-15 12:42:44 +03:00 |
|
|
Maxim Kadushkin
|
e55c823cad
|
[PE] added controller for private code
|
2021-04-13 17:54:09 +03:00 |
|
|
Julia Radzhabova
|
9b6ec674de
|
Merge pull request #779 from ONLYOFFICE/release/v6.3.0
Release/v6.3.0
|
2021-04-02 11:53:39 +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 |
|
|
SergeyEzhin
|
dd3b5fafe0
|
[SSE mobile] Corrected some things
|
2021-03-30 17:51:53 +03:00 |
|
|
Julia Radzhabova
|
7e88e04dd2
|
For Bug 47092
|
2021-03-30 16:30:01 +03:00 |
|
|
JuliaSvinareva
|
d1c32d886f
|
[mobile] Fix add custom color
|
2021-03-30 16:19:20 +03:00 |
|
|
SergeyEzhin
|
5a090f8210
|
Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-fixes
|
2021-03-30 15:36:06 +03:00 |
|
|
Julia Radzhabova
|
1e18f144c2
|
Merge branch 'fix/request-close' into develop
|
2021-03-30 15:34:56 +03:00 |
|
|
Julia Radzhabova
|
b1d3ba3fc0
|
Merge branch 'release/v6.3.0' into develop
|
2021-03-29 16:33:45 +03:00 |
|
|
Julia Radzhabova
|
84d357560e
|
Add method requestClose (show warning on unsaved changes)
|
2021-03-29 14:30:31 +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 |
|
|
JuliaSvinareva
|
4660a3ddcd
|
[PE mobile] Fix context menu
|
2021-03-27 16:32:27 +03:00 |
|
|
SergeyEzhin
|
1876de1e87
|
[mobile] Corrected About
|
2021-03-26 17:48:18 +03:00 |
|
|
Julia Radzhabova
|
3b901f91e4
|
Use sdk class
|
2021-03-26 14:29:16 +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
|
af181a55b2
|
Update translation
|
2021-03-19 22:18:18 +03:00 |
|
|
Julia Radzhabova
|
7c025d7967
|
Update translation
|
2021-03-19 22:08:12 +03:00 |
|
|
JuliaSvinareva
|
f33112be3a
|
[mobile] Fix icons
|
2021-03-19 13:53:33 +03:00 |
|
|
SergeyEzhin
|
90b613d88d
|
[mobile] Corrected some elements
|
2021-03-18 17:00:52 +03:00 |
|
|
Julia Radzhabova
|
916c911ac7
|
[Mobile] Use config permssions to view comments
|
2021-03-17 23:57:54 +03:00 |
|
|
SergeyEzhin
|
573d1c49c5
|
[mobile] Added About
|
2021-03-17 18:44:35 +03:00 |
|
|
Julia Radzhabova
|
f35e929713
|
Add permissions for edit/remove comments
|
2021-03-17 12:02:06 +03:00 |
|
|
JuliaSvinareva
|
6f5f84a7aa
|
Merge branch 'feature/mobile-apps-on-reactjs-pe' into feature/mobile-apps-on-reactjs
|
2021-03-16 20:20:54 +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 |
|
|
SergeyEzhin
|
555e983bc3
|
[PE mobile] Small edits
|
2021-03-16 16:41:17 +03:00 |
|
|
SergeyEzhin
|
32f5bd693e
|
[DE PE mobile] Correcting Find and Replace
|
2021-03-15 21:35:19 +03:00 |
|
|
SergeyEzhin
|
257c564d35
|
[PE mobile] Corrected stores according to mobx v. 6 and Slide Settings
|
2021-03-15 20:29:01 +03:00 |
|
|
Julia Radzhabova
|
d8a5e8244a
|
Update translation
|
2021-03-12 20:53:03 +03:00 |
|
|
Julia Radzhabova
|
3b673e6be4
|
Update translation
|
2021-03-12 20:27:25 +03:00 |
|
|
Maxim Kadushkin
|
3b40251853
|
[mobile] fill 'About' info in compile time
|
2021-03-11 10:21:22 +03:00 |
|
|
SergeyEzhin
|
e47157f949
|
[PE mobile] Fixed Presentation Settings according to mobx v. 6
|
2021-03-10 21:46:18 +03:00 |
|