Commit graph

151 commits

Author SHA1 Message Date
Julia Radzhabova f8b95b54ab [DE] Refactoring document protection 2022-09-26 18:37:20 +03:00
Julia Radzhabova 0d9b07a6e4 Fix Bug 57826 2022-08-29 15:04:43 +03:00
Julia Radzhabova a7b640b741 Fix Bug 57874 (fix More button for FireFox and IE11) 2022-07-13 12:08:54 +03:00
Julia Radzhabova c39cee6880 Fix tooltips with special keys on Win/Mac, fix translation 2022-06-26 13:43:51 +03:00
Julia Radzhabova bb40bc8994 [DE] Refactoring toolbar locking: use lock option 2021-12-28 16:39:43 +03:00
Julia Radzhabova 92bb409c5a Send file type in events onRequestRestore, onDownloadAs, onRequestSaveAs 2021-07-30 01:01:33 +03:00
Julia Radzhabova 656715a52b Merge branch 'release/v6.4.0' into develop 2021-07-19 14:37:16 +03:00
JuliaSvinareva 147bffff21 Fix hint manager 2021-07-02 14:58:27 +03:00
JuliaSvinareva a443fcfd2a Merge branch 'develop' into feature/alt-keys 2021-07-01 16:47:01 +03:00
Maxim Kadushkin ee1ca73fb2 [scaling] correct scaling root selectors 2021-06-28 21:01:08 +03:00
Maxim Kadushkin 88c62da5f6 [common] refactoring 2021-06-25 11:29:11 +03:00
Julia Radzhabova 41d95920a7 Fix loading mask on document opening 2021-06-18 16:53:50 +03:00
JuliaSvinareva 9b8d68594b Hint Manager: changed the way of setting offsets, add hints 2021-06-01 20:07:24 +03:00
JuliaSvinareva 88f32b91f6 Hint Manager: change letter getting, add offsets, add hints for toolbar 2021-05-26 18:30:18 +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
Maxim Kadushkin 11ab64a4d8 [common] fix bug 50245 2021-05-14 22:20:56 +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
Julia Radzhabova 1bd7203489 Move UserInfoParser to sdkjs 2021-04-07 18:04:54 +03:00
Julia Radzhabova 77cd81322c Merge branch 'feature/sse-from-text' into develop 2021-04-05 11:34:54 +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
Julia Radzhabova 8274e4d3f1 Use applicationPixelRatio instead of devicePixelRatio 2021-03-29 22:33:40 +03:00
Julia Radzhabova b1d3ba3fc0 Merge branch 'release/v6.3.0' into develop 2021-03-29 16:33:45 +03:00
Julia Radzhabova 3b901f91e4 Use sdk class 2021-03-26 14:29:16 +03:00
Julia Radzhabova b5438c6648 [SSE] Import data from text/csv file 2021-03-19 17:00:05 +03:00
Julia Radzhabova 64b34da425 Comment groups: allow all actions, when view/edit/remove field is undefined 2021-03-18 14:21:13 +03:00
Julia Radzhabova 48ab72fb14 Refactoring 2021-03-18 00:03:49 +03:00
Julia Radzhabova f35e929713 Add permissions for edit/remove comments 2021-03-17 12:02:06 +03:00
Julia Radzhabova 7cc14b5f26 Refactoring review permissions 2021-03-16 13:46:44 +03:00
maxkadushkin 18083bd6b9
fix bug 48995, 48992 2021-03-11 15:14:05 +03:00
Maxim Kadushkin 730b939967 [common] fix bug 48995, 48992 2021-03-11 15:11:34 +03:00
Maxim Kadushkin 0dde4f283a [common] changed scaling condition 2021-03-06 00:54:30 +03:00
Julia Radzhabova 0075983c9f Merge branch 'develop' into feature/sse-conditional-formatting 2021-02-20 19:15:44 +03:00
Maxim Kadushkin 166b54f728 [common] correct zoom value 2021-02-18 17:33:58 +03:00
Maxim Kadushkin 10cee7a927 [common] changed function to check scaling value 2021-02-18 16:44:18 +03:00
Maxim Kadushkin 42987446fb [common] changed function to check scaling value 2021-02-18 16:39:23 +03:00
Maxim Kadushkin c9d533a00e [common] correct condition to apply 150% scaling styles 2021-02-18 11:12:17 +03:00
Maxim Kadushkin 86a441c3a3 [multiscaling] locked 150% scaling for IE 2021-02-18 00:27:20 +03:00
Maxim Kadushkin d7e889332c [multiscaling] wrong scaling mark 2021-02-18 00:26:32 +03:00
Maxim Kadushkin fcdb2ee898 [dark theme] fix common styles for IE 2021-02-16 10:21:22 +03:00
Maxim Kadushkin 6c5710506b [common] fixed condition for pixel ratio 2021-02-16 10:16:46 +03:00
Maxim Kadushkin 3636bf78c4 [all] fix for device scaling checking 2021-02-12 12:08:33 +03:00
JuliaSvinareva c541a5023f [common] Edit utils 2021-02-12 02:29:22 +03:00
Maxim Kadushkin 839d9e67e3 [common] check pixel ratio via common function 2021-02-10 23:43:49 +03:00
Maxim Kadushkin f62aa45b18 Merge branch 'develop' into feature/multiZoom5.5
# Conflicts:
#	apps/common/main/resources/img/toolbar/1x/big/.css.handlebars
#	apps/common/main/resources/less/asc-mixins.less
#	apps/common/main/resources/less/buttons.less
#	apps/common/main/resources/less/checkbox.less
#	apps/common/main/resources/less/combo-dataview.less
#	apps/common/main/resources/less/comments.less
#	apps/common/main/resources/less/common.less
#	apps/common/main/resources/less/dataview.less
#	apps/common/main/resources/less/dropdown-menu.less
#	apps/common/main/resources/less/listview.less
#	apps/common/main/resources/less/multislider-gradient.less
#	apps/common/main/resources/less/radiobox.less
#	apps/common/main/resources/less/scroller.less
#	apps/common/main/resources/less/separator.less
#	apps/common/main/resources/less/theme-colorpalette.less
#	apps/common/main/resources/less/toolbar.less
#	apps/common/main/resources/less/window.less
#	apps/documenteditor/main/resources/less/advanced-settings.less
#	apps/documenteditor/main/resources/less/filemenu.less
#	apps/documenteditor/main/resources/less/leftmenu.less
#	apps/documenteditor/main/resources/less/rightmenu.less
#	apps/documenteditor/main/resources/less/statusbar.less
#	apps/documenteditor/main/resources/less/toolbar.less
#	apps/presentationeditor/main/resources/less/leftmenu.less
#	apps/presentationeditor/main/resources/less/rightmenu.less
#	apps/presentationeditor/main/resources/less/statusbar.less
#	apps/spreadsheeteditor/main/resources/less/celleditor.less
#	apps/spreadsheeteditor/main/resources/less/leftmenu.less
#	apps/spreadsheeteditor/main/resources/less/rightmenu.less
#	apps/spreadsheeteditor/main/resources/less/statusbar.less
#	apps/spreadsheeteditor/main/resources/less/toolbar.less
2021-02-10 15:40:30 +03:00
Julia Radzhabova f17b8d1c76 Change review permissions: deprecate customization.reviewPermissions parameter. Use permissions.reviewGroup instead: list of groups, that current user can accept/reject. 2021-02-05 13:51:37 +03:00
Maxim Kadushkin 5cd3145d73 [multiscaling] changed "wrapping" and "table borders" icons in DE 2021-01-26 23:52:43 +03:00
Maxim Kadushkin ed7f30f957 [scaling] repaired style for some components 2021-01-15 18:58:54 +03:00