Commit graph

191 commits

Author SHA1 Message Date
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
Julia Radzhabova 46d7ed84f1 [SSE] Draw preview when format is not set 2021-01-28 21:56:57 +03:00
Julia Radzhabova cb608f56f7 [SSE] Add translation for conditional formats 2021-01-28 21:38:00 +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
Julia Radzhabova 86e628b6b6 Add new chart types 2021-01-14 12:57:22 +03:00
Julia Radzhabova 64f81a2984 Merge branch 'feature/guest-name' into develop 2020-12-30 11:24:02 +03:00
Julia Radzhabova 2be4649d63 [DE] Set name for guest user 2020-12-11 13:08:13 +03:00
Julia Radzhabova c92e9cf2c7 [SSE] Add icons 2020-12-10 15:29:58 +03:00
Julia Radzhabova 583065a6af [DE] Change name for guest user 2020-12-10 14:48:03 +03:00
Julia Radzhabova 27663a1691 [SSE] Change chart type 2020-12-04 19:20:28 +03:00
Maxim Kadushkin 4348ef2baf [all] fix bug 47095 2020-11-27 11:39:38 +03:00
JuliaSvinareva 2e0db02b05 [common] Update utils 2020-11-23 17:04:38 +03:00
Maxim Kadushkin 89f733ae30 [all] unlocked adapt to 150% system scaling 2020-11-20 22:57:20 +03:00
Julia Radzhabova 1f04c90813 [DE] Add form control settings to the right panel 2020-09-28 19:06:12 +03:00
Julia Radzhabova 09eba3c88b Merge branch 'release/v6.0.0' into develop 2020-09-17 18:26:57 +03:00
Julia Radzhabova 5b476901d2 [SSE] Fix Bug 46535 2020-09-11 10:47:09 +03:00
Julia Radzhabova be2924ef60 Change api config: add user.group parameter used for customization.reviewPermissions (added as prefix).
Use nbsp separator for username prefix.
2020-09-02 20:53:49 +03:00
Maxim Kadushkin 3c319d0fd9 debug 2020-08-31 20:23:23 +03:00
Julia Radzhabova 33c6978d27 Fix keydown events after closing window 2020-08-17 18:42:07 +03:00
Julia Radzhabova e222fdf4a7 Add parameter to api config: customization.reviewPermissions (user name must be prefixed) 2020-08-04 22:20:20 +03:00
Maxim Kadushkin 82dc591fd0 [common] debug 2020-07-31 20:34:55 +03:00
Julia Radzhabova a9da5afdd4 Fix keydown events after closing window 2020-07-28 16:49:47 +03:00
Julia Radzhabova 5f58bd0ca0 [DE] Add autocorrect options 2020-07-03 14:59:48 +03:00
Maxim Kadushkin 1b5d500bdb [all] add missed resources 2020-06-30 17:36:28 +03:00
Julia Radzhabova 4a246ef70f Merge branch 'develop' into feature/sse-conditional-formatting 2020-06-16 16:09:39 +03:00
Julia Radzhabova c3eb5132da [SSE] Show slicer settings in the right menu 2020-05-27 16:33:34 +03:00
Julia Radzhabova b54c2e4d10 Merge branch 'develop' into feature/sse-conditional-formatting
# Conflicts:
#	apps/spreadsheeteditor/main/app/controller/Toolbar.js
2020-05-15 14:29:20 +03:00
Maxim Kadushkin 5e200c6ed9 [desktop] fix bug 45266 2020-05-14 14:17:34 +03:00
Julia Radzhabova e8e8520f98 [SSE] Debug rule settings 2020-04-30 16:58:45 +03:00
Maxim Kadushkin f50d0253ca [all] debug locked file open 2020-04-29 20:54:48 +03:00
Julia Radzhabova 5904c08e15 Refactoring button component 2020-04-29 10:36:53 +03:00
Maxim Kadushkin d466ed1201 Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 2020-04-22 16:41:16 +03:00
Julia Radzhabova 67dd73e767 Refactoring 2020-04-22 12:35:55 +03:00
Maxim Kadushkin c462bd6ddb [desktop] fix bug 45005 2020-04-21 17:03:04 +03:00
Julia Radzhabova 6573cc7a84 Merge branch 'hotfix/v5.5.1' into develop 2020-04-15 15:04:23 +03:00
Julia Radzhabova 308428d83f Fix Bug 44916 2020-03-31 16:49:33 +03:00
Maxim Kadushkin 586d26619f [desktop] fix bug 42729 2020-03-15 18:13:29 +03:00
Maxim Kadushkin 0125ad24f3 [common] restored 'checkSize' function 2019-12-11 19:29:52 +03:00
Maxim Kadushkin 670b6cf2c6 merge with develop 2019-11-28 17:11:18 +03:00
Julia Radzhabova e47015cc18 Move chart data to common 2019-11-18 13:40:10 +03:00
Julia Radzhabova 73f268aa54 Add symbol table dialog 2019-11-08 11:34:53 +03:00
Maxim Kadushkin 1407e01f4c Merge branch 'develop' into feature/svg-icons
# Conflicts:
#	apps/documenteditor/main/index.html
2019-10-07 16:55:17 +03:00
Julia Radzhabova ddfb966857 [SSE] Fix Bug 43054 2019-10-03 16:12:55 +03:00
Julia Radzhabova 13aef92894 Fix Bug 42962 2019-09-29 13:22:16 +03:00
Julia Radzhabova 960a107e8e Merge branch 'develop' into feature/optimization 2019-08-19 10:27:00 +03:00
Julia Radzhabova 481064faf5 [SSE] Fix loading region settings 2019-08-13 15:40:02 +03:00
Julia Radzhabova ba594bfdec Deprecate user firstname and lastname 2019-07-30 13:52:43 +03:00
Maxim Kadushkin ae675ba38f [common] inner function to search elements by id 2019-07-29 18:30:57 +03:00
Julia Radzhabova bd6071ccd2 Merge branch 'feature/comment-mentions' into develop 2019-07-12 17:00:29 +03:00
Julia Radzhabova 8a543f82fa Refactoring: disable ButtonsArray on start 2019-06-14 15:54:38 +03:00
Julia Radzhabova 4321974f75 Use ButtonsArray for group of buttons 2019-06-11 14:27:25 +03:00
Julia Radzhabova e347b92a0f Use ButtonsArray for group of buttons 2019-06-11 10:52:13 +03:00
Julia Radzhabova 863e500d67 Refactoring buttons render 2019-06-10 13:45:38 +03:00
Julia Radzhabova 5fe0c2027c [DE] Bug 40719: thumbs count in slider > 2. Change shape settings for multi-gradient. 2019-06-06 15:03:38 +03:00
Julia Radzhabova 42391fdea4 Refactoring toolbar lock 2019-05-29 16:49:52 +03:00
Maxim Kadushkin cc7b8102ca Merge branch 'release/v5.3.0' into develop
# Conflicts:
#	apps/documenteditor/main/app/controller/Main.js
2019-05-22 16:02:54 +03:00
Julia Radzhabova 69c9cc3dab Merge branch 'feature/async-xhr' into develop 2019-05-17 11:40:40 +03:00
Julia Radzhabova 58a1ddb834 Find emails for sending invitation (begins with + or @) when adding comment. 2019-04-18 17:06:46 +03:00
Julia Radzhabova 60004afb1d Change layout for Open Dialog.
[SSE] Add import wizard for special paste
2019-04-17 12:01:20 +03:00
Julia Radzhabova 9d93ca73a3 Fix language info 2019-04-05 11:39:18 +03:00
Maxim Kadushkin 0fc75a9ab5 [common] ActiveXObject for XMLHttpRequest failed in IE11 for some requests 2019-03-12 17:02:38 +03:00
Julia Radzhabova 2de3922437 Fix tooltip layout for menu items 2019-03-07 14:16:57 +03:00
Maxim Kadushkin 83218b80a9 [common] refactoring 2019-02-15 13:44:54 +03:00
Maxim Kadushkin 0810196641 Merge branch 'develop' into feature/async-xhr 2019-02-13 11:29:15 +03:00
Julia Radzhabova 048b8480ce Merge branch 'hotfix/v5.2.8' into develop 2019-02-05 16:43:52 +03:00
Maxim Kadushkin 74aa97c8f6 [DE] async load plugins list from server 2019-02-04 15:48:51 +03:00
Julia Radzhabova 7d54f26372 Fix Bug 35911 2019-01-28 16:51:07 +03:00
Alexander.Trofimov c10009a464 [copyright] Update Copyright
Limited -> SIA
2019-01-17 16:05:03 +03:00
Alexander.Trofimov 68a1691d28 [copyright] For bug 39644
Change address Latvian office.
2019-01-17 16:00:34 +03:00
Alexander.Trofimov 1c9e684698 [copyright] Update Copyright
2018 -> 2019
2019-01-17 15:58:05 +03:00
Julia Radzhabova afc6ede0bf Fix duplication of error message 2018-07-30 17:21:34 +03:00
Maxim Kadushkin af8edb29ca merge with develop 2018-07-18 15:24:51 +03:00
Julia Radzhabova ff89d888dc [SSE] Add cell settings to the right panel 2018-06-09 14:11:56 +03:00
Maxim Kadushkin 03e6994738 Merge branch 'develop' into feature/desktop-new 2018-03-14 18:08:19 +03:00
Maxim Kadushkin 3e60e495a0 Merge branch 'develop' into feature/svg-icons 2018-03-04 23:49:46 +03:00
Pavel Lobashov 06da18bf2d Update copyright to 2018 2018-03-01 15:16:38 +03:00
Maxim Kadushkin 482a7d11bf Merge branch 'develop' into feature/desktop-new
# Conflicts:
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/controller/Toolbar.js
#	apps/presentationeditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/controller/Main.js
2018-02-22 02:41:49 +03:00
Julia Radzhabova 9c5d1310d9 Don't support IE version <10. 2018-02-20 13:45:35 +03:00
Julia Radzhabova 25f67ef1f5 Fix Bug 36930. 2018-02-16 10:12:35 +03:00
Maxim Kadushkin c3260dfc38 initialized app's strart params 2018-02-07 01:37:23 +03:00
Maxim Kadushkin d3b23c19f8 implement changes according to draft design 2018-02-06 01:01:29 +03:00
Maxim Kadushkin c8e9fe9a63 Merge branch 'develop' into feature/desktop-new
# Conflicts:
#	apps/common/main/lib/util/utils.js
2018-02-02 16:18:07 +03:00
Maxim Kadushkin e9908541a7 apply to sdk only integer zoom 2018-02-02 01:24:30 +03:00
Maxim Kadushkin 1497eae9d2 zomm step changed to 50% 2018-02-01 17:14:11 +03:00
Maxim Kadushkin 106afacb6e [common] added nessesary utils 2018-01-23 20:33:59 +03:00
Julia Radzhabova f76532ac36 Fix tip position when the bottom of the tip is greater then browser height. 2017-12-20 14:08:33 +03:00
Julia Radzhabova ed738d411d Add method for getting application prefix. 2017-11-28 16:26:11 +03:00
Julia Radzhabova f49404e8b5 Feature/new toolbar signature 2017-11-27 14:15:10 +03:00
Julia Radzhabova db3475a6e6 Merge branch 'feature/collaboration-tab' into develop 2017-10-27 16:03:03 +03:00
Julia Radzhabova 968661758c Merge branch 'hotfix/v5.0.2' into develop 2017-10-13 15:11:11 +03:00
Julia Radzhabova 1057868cda Set application prefix for Collaboration tab (used for saving to local storage). 2017-10-12 12:05:55 +03:00
Julia Radzhabova 76cbae43d5 Merge branch 'develop' into feature/new-toolbar-pivot-table 2017-10-11 12:14:58 +03:00
Maxim Kadushkin c0772ef73a refactoring 2017-10-03 20:40:53 +03:00
Julia Radzhabova b4029143fa [DE] Fix Bug 35406. 2017-10-03 14:22:33 +03:00
Julia Radzhabova c1e8ec1017 Merge branch 'develop' into feature/new-toolbar-pivot-table 2017-09-29 11:26:45 +03:00
Julia Radzhabova 2f92c81749 [DE] View signatures in the right panel. 2017-09-13 11:29:05 +03:00
Julia Radzhabova a701bbae4f Merge branch 'develop' into feature/new-toolbar-pivot-table 2017-09-07 16:15:13 +03:00
Maxim Kadushkin cd5721977d refactoring 2017-09-04 17:20:46 +03:00