Julia Radzhabova
|
8cbdfcedfb
|
Merge branch 'develop' into feature/sse-protection
|
2021-08-05 13:49:29 +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 |
|
|
Julia Radzhabova
|
f13673653f
|
Merge branch 'release/v6.4.0' into develop
|
2021-07-22 17:44:51 +03:00 |
|
|
Julia Radzhabova
|
1b163e8dbe
|
Fix translation
|
2021-07-20 17:17:45 +03:00 |
|
maxkadushkin
|
c934dd3640
|
Merge branch 'release/v6.4.0' into feature/bug-fixes
|
2021-07-19 17:24:31 +03:00 |
|
|
Julia Radzhabova
|
656715a52b
|
Merge branch 'release/v6.4.0' into develop
|
2021-07-19 14:37:16 +03:00 |
|
|
SergeyEzhin
|
6067e344a2
|
Fix Bug 49540
|
2021-07-17 02:45:16 +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 |
|
|
SergeyEzhin
|
e5b87b9aa6
|
[SSE mobile] Add encoding options
|
2021-07-14 20:42:05 +03:00 |
|
|
Julia Radzhabova
|
4ff491ce98
|
Update translation
|
2021-07-13 22:48:21 +03:00 |
|
|
SergeyEzhin
|
4940291ce6
|
[SSE mobile] Fix Bug 43270
|
2021-07-01 22:11:42 +03:00 |
|
|
ShimaginAndrey
|
5a0cc476d6
|
[SSE] Add dialog Sorting
|
2021-06-29 16:02:49 +03:00 |
|
|
Maxim Kadushkin
|
bae484e6a4
|
Merge branch 'feature/load-external-themes' into develop
|
2021-06-28 23:51:38 +03:00 |
|
|
maxkadushkin
|
8562f46186
|
Merge pull request #950 from ONLYOFFICE/feature/Bug_47151
Feature/bug 47151
|
2021-06-28 19:08:31 +03:00 |
|
JuliaSvinareva
|
dbf70c662a
|
[mobile] Bug 47107
|
2021-06-28 17:45:02 +03:00 |
|
|
JuliaSvinareva
|
175a2a0d44
|
[SSE mobile] Bug 48387
|
2021-06-28 14:39:33 +03:00 |
|
|
ShimaginAndrey
|
21b385dcd1
|
Changing the sorting buttons
|
2021-06-24 18:18:38 +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 |
|
|
Julia Radzhabova
|
fb57f2d0e2
|
[SSE] Add error on a protected sheet
|
2021-06-22 16:15:15 +03:00 |
|
Rieffen
|
6939100df7
|
Update fr.json
|
2021-06-21 16:35:31 +02:00 |
|
|
SergeyEzhin
|
e3b52d0bcb
|
[DE PE SSE mobile] Fix Bug 50778
|
2021-06-16 19:14:58 +03:00 |
|
|
SergeyEzhin
|
04569201b9
|
[SSE mobile] Fix bug 50037
|
2021-06-07 15:34:37 +03:00 |
|
|
SergeyEzhin
|
f5ca014da5
|
[DE PE SSE mobile] Bug 49112
|
2021-06-03 16:25:52 +03:00 |
|
|
JuliaSvinareva
|
3382d2f373
|
Merge branch 'feature/develop-fixes' into develop
|
2021-05-31 16:29:18 +03:00 |
|
|
SergeyEzhin
|
edd4ed6629
|
[SSE mobile] Bug 48058
|
2021-05-28 15:12:21 +03:00 |
|
|
Julia Radzhabova
|
805452abc9
|
[SSE][SSE mobile] Add ConfirmReplaceFormulaInTable error
|
2021-05-27 16:59:39 +03:00 |
|
|
JuliaSvinareva
|
5c51353d23
|
Merge branch 'feature/develop-fixes' into develop
|
2021-05-27 12:58:19 +03:00 |
|
|
SergeyEzhin
|
d871811be4
|
Correct translation
|
2021-05-25 18:45:39 +03:00 |
|
|
JuliaSvinareva
|
e3be43c3ee
|
[SSE mobile] Refactoring filter options
|
2021-05-24 13:32:35 +03:00 |
|
|
ShimaginAndrey
|
10927e6f63
|
Filter Options
|
2021-05-23 18:27:21 +03:00 |
|
|
Julia Radzhabova
|
45d7980212
|
Merge branch 'release/v6.3.0' into develop
|
2021-05-21 12:28:54 +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 |
|
|
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 |
|
|
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
|
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
|
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 |
|