SergeyEzhin
|
c254f2c93a
|
Corrected replace all
|
2021-05-27 15:41:15 +03:00 |
|
JuliaSvinareva
|
5c51353d23
|
Merge branch 'feature/develop-fixes' into develop
|
2021-05-27 12:58:19 +03:00 |
|
|
SergeyEzhin
|
0304b97fa2
|
[SSE mobile] Correct main.jsx
|
2021-05-25 18:56:42 +03:00 |
|
|
SergeyEzhin
|
d871811be4
|
Correct translation
|
2021-05-25 18:45:39 +03:00 |
|
Julia Radzhabova
|
98d5a0d8fd
|
Merge pull request #900 from ONLYOFFICE/feature/user-anonymous
Feature/user anonymous
|
2021-05-25 18:34:47 +03:00 |
|
|
JuliaSvinareva
|
642f72f182
|
Merge branch 'feature/fix-bug-shimaginA' into develop
|
2021-05-25 18:01:22 +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 |
|
|
JuliaSvinareva
|
e3be43c3ee
|
[SSE mobile] Refactoring filter options
|
2021-05-24 13:32:35 +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 |
|
|
SergeyEzhin
|
1ffa6d8c9d
|
[SSE mobile] Bug 47073
|
2021-05-21 19:45:02 +03:00 |
|
|
SergeyEzhin
|
1cce447301
|
[DE PE SSE mobile] Bug 50406
|
2021-05-21 16:37:50 +03:00 |
|
|
SergeyEzhin
|
9c6a685bf5
|
[SSE mobile] Bug 49779
|
2021-05-21 16:02:28 +03:00 |
|
|
Julia Radzhabova
|
45d7980212
|
Merge branch 'release/v6.3.0' into develop
|
2021-05-21 12:28:54 +03:00 |
|
|
SergeyEzhin
|
b8004facae
|
[SSE mobile] Correct edit link
|
2021-05-20 23:05:58 +03:00 |
|
|
SergeyEzhin
|
fee213f283
|
[SSE mobile] Bug 48754
|
2021-05-20 13:37:23 +03:00 |
|
|
SergeyEzhin
|
001ff01102
|
[SSE mobile] Bug 50398
|
2021-05-18 20:59:22 +03:00 |
|
|
SergeyEzhin
|
1f0b09c539
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop
|
2021-05-18 16:07:24 +03:00 |
|
|
SergeyEzhin
|
75fdffe6a9
|
[SSE mobile] Corrected add function
|
2021-05-18 16:06:24 +03:00 |
|
|
JuliaSvinareva
|
affeda1999
|
[SSE mobile] Fix templates
|
2021-05-18 13:46:26 +03:00 |
|
|
JuliaSvinareva
|
e24fa28ff6
|
[mobile] Make long actions
|
2021-05-17 15:36:00 +03:00 |
|
|
JuliaSvinareva
|
cd396f147f
|
[SSE mobile] Add skeleton
|
2021-05-17 14:55:21 +03:00 |
|
|
JuliaSvinareva
|
6c6f0899ef
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop
|
2021-05-14 15:27:11 +03:00 |
|
|
JuliaSvinareva
|
18e9f7441b
|
[SSE mobile] Fix error in long actions controller
|
2021-05-14 15:26:38 +03:00 |
|
|
Julia Radzhabova
|
a4b302e590
|
[SSE mobile] Change formulas descriptions
|
2021-05-14 15:26:31 +03:00 |
|
|
Julia Radzhabova
|
d7d387c27a
|
Update translation
|
2021-05-14 15:02:42 +03:00 |
|
|
Julia Radzhabova
|
4145b0a443
|
[SSE mobile] Fix Bug 50398
|
2021-05-14 13:24:54 +03:00 |
|
Maxim Kadushkin
|
d16354f4f6
|
[SSE mobile] changes for prod version
|
2021-05-14 13:08:08 +03:00 |
|
|
Maxim Kadushkin
|
76c1e846a6
|
[SSE mobile] changes for prod version
|
2021-05-14 11:19:30 +03:00 |
|
|
JuliaSvinareva
|
d9905d9789
|
[SSE mobile] Fix template of edit cell
|
2021-05-13 19:05:39 +03:00 |
|
|
JuliaSvinareva
|
41105c00ef
|
[SSE mobile] Bug 48623 (Moved code from main controller, removed unused code)
|
2021-05-13 18:37:00 +03:00 |
|
|
JuliaSvinareva
|
c36ed41d35
|
[SSE mobile] Fix translations
|
2021-05-13 18:34:30 +03:00 |
|
|
JuliaSvinareva
|
861c60caff
|
Merge branch 'feature/mobile-apps-on-reactjs-fixes' into develop
|
2021-05-13 18:09:03 +03:00 |
|
|
Maxim Kadushkin
|
f6648ac5fa
|
[SSE mobile] debug production version
|
2021-05-13 17:15:58 +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 |
|
|
Maxim Kadushkin
|
9a0a89b077
|
[SSE] fix deployment for mobile app
|
2021-05-11 20:43:00 +03:00 |
|
|
Maxim Kadushkin
|
c4955d60fb
|
[SSE] debug deployment
|
2021-05-11 13:24:45 +03:00 |
|
|
SergeyEzhin
|
be110e5eff
|
[SSE mobile] Bug 48659
|
2021-05-07 20:29:28 +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 |
|
|
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
|
5a244af7a1
|
[SSE mobile] Bug 48623
|
2021-05-04 19:40:35 +03:00 |
|
|
Julia Radzhabova
|
c84304afd5
|
[SSE mobile] Fix Bug 50200
|
2021-05-04 15:54:38 +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
|
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 |
|
|
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 |
|
|
Maxim Kadushkin
|
3726a1235f
|
[SSE mobile] refactoring
|
2021-04-30 15:25:28 +03:00 |
|
|
SergeyEzhin
|
024e20266d
|
[SSE mobile] Corrected toolbar
|
2021-04-30 15:11:18 +03:00 |
|
|
JuliaSvinareva
|
cc66831f6c
|
[SSE mobile] Bug 50044
|
2021-04-30 14:58:41 +03:00 |
|
|
SergeyEzhin
|
45b0cb2bac
|
[common] Edits toolbar and corrected searchbar
|
2021-04-30 01:18:03 +03:00 |
|
|
Maxim Kadushkin
|
97474af94d
|
Merge branch 'release/v6.3.0' into develop
# Conflicts:
# apps/common/main/lib/controller/Plugins.js
# apps/common/main/lib/view/Header.js
# apps/documenteditor/main/app/controller/Main.js
# apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
# apps/documenteditor/main/app/view/Toolbar.js
# apps/documenteditor/main/locale/sl.json
# apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
# apps/presentationeditor/main/locale/ja.json
# apps/spreadsheeteditor/main/app/controller/Main.js
# apps/spreadsheeteditor/main/app/template/Toolbar.template
# apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
|
2021-04-29 23:31:07 +03:00 |
|
|
JuliaSvinareva
|
705a4f08ae
|
[SSE mobile] Bug 50044
|
2021-04-29 19:25:40 +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 |
|
|
Julia Radzhabova
|
dce1a7a54c
|
Fix Bug 50044
|
2021-04-27 17:31:38 +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 |
|
|
ShimaginAndrey
|
3c97073b0e
|
Merge branch 'feature/mobile-apps-on-reactjs' into feature/fix-bug-shimaginA
|
2021-04-27 15:18:14 +03:00 |
|
|
JuliaSvinareva
|
ad5104c8c5
|
[mobile] Fix long actions controller
|
2021-04-26 18:43:12 +03:00 |
|
|
JuliaSvinareva
|
8fb9119f01
|
[SSE mobile] Make main controller
|
2021-04-24 17:57:44 +03:00 |
|
|
Julia Radzhabova
|
be9918cfa3
|
Update translation
|
2021-04-23 16:24:35 +03:00 |
|
|
JuliaSvinareva
|
0d82918ed5
|
[SSE mobile] Add error controller, add long actions controller
|
2021-04-22 21:57:08 +03:00 |
|
|
JuliaSvinareva
|
588a7f0386
|
[SSE mobile] Moved edit functions of context menu to private branch
|
2021-04-22 13:54:26 +03:00 |
|
|
JuliaSvinareva
|
cfbb8ce795
|
[SSE mobile] Add toolbar, add logo
|
2021-04-21 21:04:52 +03:00 |
|
|
JuliaSvinareva
|
7c72e8cb1b
|
[SSE mobile] Changes for code decomposition
|
2021-04-21 16:32:30 +03:00 |
|
|
ShimaginAndrey
|
9b16457b17
|
Fix Bug №48073
|
2021-04-21 12:44:29 +03:00 |
|
|
Julia Radzhabova
|
a910082c4c
|
[SSE mobile] Fix Bug 49728
|
2021-04-19 20:11:09 +03:00 |
|
|
Julia Radzhabova
|
e591a4477a
|
Update translation
|
2021-04-16 17:37:12 +03:00 |
|
|
Julia Radzhabova
|
94c9e77313
|
Update translation
|
2021-04-16 17:18:23 +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 |
|
|
Maxim Kadushkin
|
8943602605
|
[SSE mobile] added controller for private code
|
2021-04-13 17:54:42 +03:00 |
|
|
JuliaSvinareva
|
45bbe12dda
|
Merge branch 'feature/mobile-apps-on-reactjs-statusbar' into feature/mobile-apps-on-reactjs
|
2021-04-05 20:42:17 +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 |
|
|
JuliaSvinareva
|
babe1233a9
|
[mobile] Add handler for try undo in fast collaborative
|
2021-04-01 23:27:58 +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 |
|
|
SergeyEzhin
|
fe684e0edb
|
[SSE mobile] Corrected highlighting tabs
|
2021-03-30 15:17:24 +03:00 |
|
|
SergeyEzhin
|
3f8e1390be
|
Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-statusbar
|
2021-03-29 22:13:53 +03:00 |
|
|
SergeyEzhin
|
722bc4b014
|
[SSE mobile] Correct tabs is Statusbar
|
2021-03-29 22:10:45 +03:00 |
|
|
JuliaSvinareva
|
0824d2388d
|
[SSE mobile] Fix open worksheet range link in context menu
|
2021-03-29 20:00:55 +03:00 |
|
|
JuliaSvinareva
|
5f82245fd2
|
[SSE mobile] Fix useEffect in statusbar
|
2021-03-29 19:59:11 +03:00 |
|
|
Julia Radzhabova
|
b1d3ba3fc0
|
Merge branch 'release/v6.3.0' into develop
|
2021-03-29 16:33:45 +03:00 |
|
|
JuliaSvinareva
|
8d2f89b62e
|
Merge branch 'feature/mobile-apps-on-reactjs-statusbar' into feature/mobile-apps-on-reactjs
|
2021-03-29 14:49:40 +03:00 |
|
|
SergeyEzhin
|
25213e6313
|
[SSE mobile] Some fixes
|
2021-03-29 14:43:06 +03:00 |
|
|
Julia Radzhabova
|
84d357560e
|
Add method requestClose (show warning on unsaved changes)
|
2021-03-29 14:30:31 +03:00 |
|