Commit graph

1597 commits

Author SHA1 Message Date
Julia Radzhabova 59c658ecab Wopi: change config parameters and post messages 2021-05-13 00:57:01 +03:00
Julia Radzhabova f8ee00314a Change file sharing by url for wopi 2021-05-12 22:27:57 +03:00
Julia Radzhabova 4a383469a3 Merge remote-tracking branch 'origin/develop' into develop 2021-05-12 19:04:37 +03:00
Julia Radzhabova 5c7350e28f Support rename for wopi 2021-05-12 19:04:14 +03:00
JuliaSvinareva ed70fe9442 [common] Fix error when clicking on next review in mobile 2021-05-12 18:59:34 +03:00
Maxim Kadushkin c8c5810d1c [common] extend htmlEncode function 2021-05-06 16:29:27 +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
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
Maxim Kadushkin 1244f69115 [common] fix bug 50136 2021-04-29 19:32:00 +03:00
Julia Radzhabova 09a27c30b8 For Bug 50113 2021-04-29 15:41:04 +03:00
Julia Radzhabova 24110bdac2 [PE] Add settings for notes panel 2021-04-26 19:49:10 +03:00
Julia Radzhabova e6b8a379ba Fix vulnerability 2021-04-26 14:54:55 +03:00
maxkadushkin bcbaedf762
Update Themes.js 2021-04-26 13:36:18 +03:00
Maxim Kadushkin 66dba701d8 [themes] refactoring 2021-04-26 10:53:52 +03:00
maxkadushkin f5bff00038
Merge pull request #839 from ONLYOFFICE/feature/pr23-calendar-changed-style
[themes] changed calendar style
2021-04-25 22:20:47 +03:00
Maxim Kadushkin 256b1f2abd [themes] changed calendar style 2021-04-25 22:17:34 +03:00
Julia Radzhabova 6c7a22d39a
Merge pull request #838 from ONLYOFFICE/fix/bugfix
Fix/bugfix
2021-04-25 00:16:48 +03:00
Julia Radzhabova b354296c71 Fix Bug 49936 (fix rev.6d121415f237d096a3fe7354068c0d25f8622956) 2021-04-25 00:12:37 +03:00
Julia Radzhabova 1449b92acc Fix plugins 2021-04-24 23:39:27 +03:00
Maxim Kadushkin 9795ebde57 [theme] added new theme's values 2021-04-24 23:20:55 +03:00
Maxim Kadushkin 386bf60f37 [themes] debug themes 2021-04-24 19:42:14 +03:00
Julia Radzhabova bc6653ef7f [DE] Fix Bug 49928 2021-04-24 01:30:36 +03:00
Julia Radzhabova f3150a5bfe Fix Bug 49877 2021-04-23 17:08:29 +03:00
maxkadushkin a0f7048e16
Update Themes.js 2021-04-23 15:39:46 +03:00
maxkadushkin 1d989777a7
[themes] fix bug 49875 2021-04-23 00:25:31 +03:00
Maxim Kadushkin 493ad0ac9e [themes] changed theme's current value 2021-04-22 19:49:37 +03:00
Julia Radzhabova fdc6343305 Fix bug 2021-04-22 19:24:26 +03:00
maxkadushkin 0caa949644
Merge pull request #827 from ONLYOFFICE/feature/classic-light-theme
Feature/classic light theme
2021-04-22 12:54:33 +03:00
Maxim Kadushkin 7d8787b46f [themes] added options to load single theme 2021-04-22 12:47:36 +03:00
Julia Radzhabova 0cff183c31 Fix Bug 49783 2021-04-21 22:09:36 +03:00
Julia Radzhabova 5b2ab0ca0e Fix Bug 49762 (Revert rev. 6014823eb3) 2021-04-20 15:29:32 +03:00
Julia Radzhabova 062a890b20 Fix Bug 49705 2021-04-19 15:34:00 +03:00
Maxim Kadushkin 57c9c6268e [common] extended theme's object 2021-04-18 17:32:39 +03:00
Maxim Kadushkin 0cec65caae [themes] added new theme 2021-04-17 16:10:35 +03:00
Maxim Kadushkin 4d5880486d [common] refactoring 2021-04-17 16:08:04 +03:00
Julia Radzhabova d6ffb6006b Change isModal parameter for plugins config: show modal/non-modal dialog 2021-04-16 15:59:52 +03:00
Julia Radzhabova eb0a5023b2 [DE] Convert text to table 2021-04-16 00:32:56 +03:00
Julia Radzhabova 57aa29f3c8 Add focus for dialogs 2021-04-15 19:01:26 +03:00
Julia Radzhabova 5afd6e7609 Merge branch 'feature/focus-manager' into develop 2021-04-15 18:23:04 +03:00
Julia Radzhabova c2e0ffb2be Merge branch 'release/v6.3.0' into develop 2021-04-15 11:18:07 +03:00
Julia Radzhabova 28c9471eae [DE] Fix button focus 2021-04-15 01:24:55 +03:00
Julia Radzhabova 4d7dc3bb65 Add focus for buttons in dialogs 2021-04-15 01:02:11 +03:00
Julia Radzhabova 703f0f7532 Refactoring focus for checkbox/radiobox 2021-04-14 19:37:20 +03:00
Julia Radzhabova 576c42036f [DE][PE] Focus support for radiobox 2021-04-14 11:01:41 +03:00
Julia Radzhabova 1949441c55 Refactoring focus manager 2021-04-14 01:30:54 +03:00
Julia Radzhabova 66089fee9d Fix focus for disabled checkbox 2021-04-13 16:54:21 +03:00
Julia Radzhabova 9509869377 [DE] Add focus for checkbox 2021-04-13 16:51:24 +03:00
Julia Radzhabova a6f7d17261 Focus support for checkbox 2021-04-13 10:28:06 +03:00
maxkadushkin b896c021f4
Merge pull request #806 from ONLYOFFICE/feature/pr17-fix-bug-49591
[common] fix bug 49591
2021-04-12 21:50:45 +03:00
Maxim Kadushkin 0a8659a341 [common] fix bug 49591 2021-04-12 21:46:28 +03:00