Commit graph

805 commits

Author SHA1 Message Date
SergeyEzhin 55e8fbea42 Bug 49294 2021-07-09 16:58:57 +03:00
ShimaginAndrey 1486c12cd4 [DE PE SSE]Setting rights for comments 2021-07-06 17:13:55 +03:00
Julia Radzhabova 9396f76125 [Mobile] Always use user info parser 2021-07-02 02:06:34 +03:00
ShimaginAndrey a2172f924d Common.Utils.UserInfoParser -> AscCommon.UserInfoParser 2021-07-01 12:52:01 +03:00
JuliaSvinareva 2887aa1b06 [mobile] Fix bug 47933, fix context menu in comment mode 2021-06-29 22:03:37 +03:00
maxkadushkin adb073b2ae
Merge pull request #949 from ONLYOFFICE/fix/fix-bugs-on-mobiles
Fix/fix bugs on mobiles
2021-06-28 17:52:35 +03:00
JuliaSvinareva dbf70c662a [mobile] Bug 47107 2021-06-28 17:45:02 +03:00
maxkadushkin 2839960906
Merge pull request #948 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2021-06-28 15:54:13 +03:00
JuliaSvinareva cc850adfcc [DE PE mobile] Fix bug 50773 2021-06-28 15:52:28 +03:00
SergeyEzhin 08713dbe99 [DE PE mobile] Correct app options 2021-06-25 20:36:28 +03:00
ShimaginAndrey 9bdd5c9d2f Fix Bug 50794 2021-06-24 11:19:36 +03:00
maxkadushkin 164e2c7815
Merge pull request #941 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2021-06-23 17:23:57 +03:00
maxkadushkin 4e2962174b
Merge branch 'release/v6.4.0' into feature/fix-bug-reactjs 2021-06-23 16:19:29 +03:00
ShimaginAndrey a09aaaf883 [DE PE SSE mobile] Fix Bug 50794 2021-06-23 14:50:39 +03:00
SergeyEzhin c5874e48ac [PE mobile] Fix Bug 47072 2021-06-23 01:38:47 +03:00
maxkadushkin 8682fcd203
Merge pull request #937 from ONLYOFFICE/feature/bug-fixes
[PE mobile] Fix Bug 50946
2021-06-22 18:28:04 +03:00
Julia Radzhabova 4789fd68f0 Fix Bug 27605 2021-06-22 15:42:21 +03:00
SergeyEzhin 91c3517696 [PE mobile] Fix Bug 50946 2021-06-22 00:42:02 +03:00
SergeyEzhin 698d85360a [PE mobile] Fix Bug 50847 2021-06-21 16:05:01 +03:00
SergeyEzhin b5bbb3c6b4 [PE mobile] Fix Bug 50845 2021-06-21 15:03:09 +03:00
ShimaginAndrey 7a3aca5c8f [PE SSE mobile] Fix Bug 50926 2021-06-21 13:01:40 +03:00
maxkadushkin 71e1dd4669
Merge pull request #931 from ONLYOFFICE/fix/fix-bugs-on-mobiles
Fix/fix bugs on mobiles
2021-06-18 21:13:12 +03:00
JuliaSvinareva 5a6dfc5e8e [mobile] Fix bug 50878 2021-06-18 20:49:51 +03:00
maxkadushkin 0c95c2ec2b
Merge pull request #929 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2021-06-18 17:03:08 +03:00
SergeyEzhin 10e10ca77b [DE PE SSE mobile] Fix Bug 50897 2021-06-18 16:06:53 +03:00
JuliaSvinareva d31dd64efe [PE mobile] Fix bug 50867 2021-06-18 12:51:50 +03:00
ShimaginAndrey 005bb841dc Fix Bug 50832 2021-06-17 18:58:45 +03:00
SergeyEzhin 31705e5aea [PE SSE mobile] Fix Bug 50889 2021-06-17 14:53:47 +03:00
SergeyEzhin 6c9ad62861 [PE mobile] Fix Bug 50848 2021-06-16 19:20:59 +03:00
SergeyEzhin e3b52d0bcb [DE PE SSE mobile] Fix Bug 50778 2021-06-16 19:14:58 +03:00
ShimaginAndrey 237d03ea57 Fix Bug 50831 2021-06-15 16:14:02 +03:00
maxkadushkin 6b97f80337
Merge pull request #923 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
2021-06-11 23:47:12 +03:00
SergeyEzhin 571768c1ff [DE PE SSE mobile] Bug 47148 2021-06-11 17:20:32 +03:00
JuliaSvinareva bafa7f9688 [mobile] Fix bug 50823 2021-06-11 15:12:28 +03:00
SergeyEzhin 210e8dcd3b [DE PE SSE mobile] Fix Bug 50796 2021-06-11 01:08:23 +03:00
SergeyEzhin 80bbdf2828 [PE SSE mobile] Fix Bug 50792 2021-06-10 19:53:15 +03:00
Maxim Kadushkin b49af817e2 [all mobile] emulate default device when it's not a compatible 2021-06-10 16:05:55 +03:00
maxkadushkin a707da477c
Merge pull request #919 from ONLYOFFICE/feature/release-fixes
Feature/release fixes
2021-06-09 19:20:29 +03:00
SergeyEzhin 7b3c27c619 [PE mobile] Fix Bug 50793 2021-06-09 16:28:16 +03:00
JuliaSvinareva e2e68d25b5 [mobile] Fix bug 50797 2021-06-09 15:18:04 +03:00
JuliaSvinareva 464fd70b5b [DE PE SSE mobile] Fix bug 50779 2021-06-08 18:39:39 +03:00
JuliaSvinareva 77773d2c40 [DE PE SSE] Fix bug 50766 2021-06-08 18:22:28 +03:00
SergeyEzhin 47a4436d06 [DE PE SSE mobile] Correct application settings and comments 2021-06-07 19:54:19 +03:00
SergeyEzhin f9aefa5170 [PE mobile] Correct application settings 2021-06-07 13:13:14 +03:00
SergeyEzhin f5ca014da5 [DE PE SSE mobile] Bug 49112 2021-06-03 16:25:52 +03:00
SergeyEzhin ddae1f9da3 [PE mobile] Bug 49391 2021-06-01 18:38:08 +03:00
JuliaSvinareva 36f75e01ed [PE mobile] Removed ignore format error 2021-05-31 17:14:51 +03:00
JuliaSvinareva 4f5c9dac5f Merge branch 'feature/fix-bug-on-reactjs' into develop 2021-05-31 17:07:52 +03:00
ShimaginAndrey ac56abf8d3 Fix Bug 44360 presentation 2021-05-31 16:52:34 +03:00
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