Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
8902 commits 47 branches 5000 tags 623 MiB
Commit graph

322 commits

Author SHA1 Message Date
Julia Radzhabova 3ab6e18621 Merge branch 'release/v6.4.0' into develop 2021-08-09 13:30:40 +03:00
Julia Radzhabova 4bba1ab170 [Mobile] Update translation 2021-08-06 17:41:44 +03:00
Julia Radzhabova 7211050c0d
Merge pull request #1046 from ONLYOFFICE/feature/bug-fixes 
Feature/bug fixes
 2021-08-04 17:53:25 +03:00
Julia Radzhabova 3a3d26185f Update translation 2021-08-02 12:40:28 +03:00
Julia Radzhabova 488ca13aea Fix translation 2021-08-02 11:24:16 +03:00
Julia Radzhabova c2fdab1dc4 Update translation 2021-07-30 15:34:10 +03:00
SergeyEzhin 764e6c378a [DE PE SSE mobile] Fix Bug 49540 2021-07-30 14:11:12 +03:00
Julia Radzhabova d767fa5399 Merge branch 'release/v6.4.0' into develop 2021-07-28 00:03:49 +03:00
SergeyEzhin 3333037bf7 Remove conflict after merge 2021-07-27 12:06:52 +03:00
Julia Radzhabova fb325aaa19 Update translation 2021-07-23 20:08:13 +03:00
ShimaginAndrey e4b47bc252 [DE PE SSE] Fix Bug 51465 2021-07-23 16:09:23 +03:00
maxkadushkin 4c67f91240
Merge pull request #998 from ONLYOFFICE/feature/bug-fixes 
Feature/bug fixes
 2021-07-21 11:27:14 +03:00
Julia Radzhabova 1b163e8dbe Fix translation 2021-07-20 17:17:45 +03:00
SergeyEzhin 5117ed8834 [DE mobile] Fix Bug 51378 2021-07-19 19:54:51 +03:00
maxkadushkin c934dd3640
Merge branch 'release/v6.4.0' into feature/bug-fixes 2021-07-19 17:24:31 +03:00
SergeyEzhin 6067e344a2 Fix Bug 49540 2021-07-17 02:45:16 +03:00
SergeyEzhin 4f956a6c23 Fix Bug 49342 2021-07-17 02:36:21 +03:00
Julia Radzhabova dd6da8de34 Update translation 2021-07-16 17:07:14 +03:00
SergeyEzhin 1b5397d222 [DE SSE mobile] Correct encoding 2021-07-16 13:29:28 +03:00
Julia Radzhabova 4ff491ce98 Update translation 2021-07-13 22:48:21 +03:00
SergeyEzhin 2ae5c222f5 [DE mobile] Make encoding 2021-07-13 14:14:08 +03:00
SergeyEzhin 55e8fbea42 Bug 49294 2021-07-09 16:58:57 +03:00
Maxim Kadushkin bae484e6a4 Merge branch 'feature/load-external-themes' into develop 2021-06-28 23:51:38 +03:00
JuliaSvinareva dbf70c662a [mobile] Bug 47107 2021-06-28 17:45:02 +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
maxkadushkin 0c95c2ec2b
Merge pull request #929 from ONLYOFFICE/feature/bug-fixes 
Feature/bug fixes
 2021-06-18 17:03:08 +03:00
SergeyEzhin c85901a908 [DE mobile] Fix Bug 50904 2021-06-18 14:11:47 +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
SergeyEzhin f5ca014da5 [DE PE SSE mobile] Bug 49112 2021-06-03 16:25:52 +03:00
ShimaginAndrey 8170df1e9e Create multi-level list 2021-06-02 18:33:27 +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
Julia Radzhabova 45d7980212 Merge branch 'release/v6.3.0' into develop 2021-05-21 12:28:54 +03:00
Julia Radzhabova d7d387c27a Update translation 2021-05-14 15:02:42 +03:00
Julia Radzhabova 6360a44929 Update translation 2021-05-07 12:34:03 +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
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
SergeyEzhin 072f84a27c [DE PE SSE mobile] Corrected display collaboration 2021-04-28 01:15:16 +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
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
SergeyEzhin fe34b1c3e3 [DE mobile] Bug 47403 2021-04-21 18:38:06 +03:00
JuliaSvinareva 57043e6602 [DE mobile] Changes related to main controller 2021-04-20 19:49:49 +03:00
JuliaSvinareva 89d8b3703e [DE mobile] Make main controller, add run autostart macroses 2021-04-12 19:03:42 +03:00
JuliaSvinareva 8d6ea8f464 [DE mobile] Make main controller 2021-04-09 21:08:13 +03:00
JuliaSvinareva 904e9baf05 [DE mobile] Long action handler moved to a separate controller 2021-04-08 21:00:44 +03:00