Commit graph

365 commits

Author SHA1 Message Date
Julia Radzhabova 2b547dc8c5 [DE] Change preview for list types 2021-04-01 18:57:00 +03:00
Julia Radzhabova 90cfe5c364 [DE] Draw list preview in sdk 2021-03-30 19:39:12 +03:00
Julia Radzhabova b0fedaa13f Merge branch 'master' into release/v6.3.0 2021-03-04 13:51:02 +03:00
Julia Radzhabova f76b650704 Merge branch 'feature/list-levels' into develop 2021-02-26 13:46:28 +03:00
Julia Radzhabova 17a1ec78e4 Change synchronize tip component: add new placements 2021-02-17 20:25:30 +03:00
Maxim Kadushkin 2ba6fdd351 [DE] fixed some components for x1.5 scaling 2021-02-17 13:46:21 +03:00
Julia Radzhabova 47f079dcb3 Merge branch 'develop' into feature/new-chart-types 2021-02-11 17:22:09 +03:00
Julia Radzhabova b7089a7344 [DE] Show Forms tab in fill form mode 2021-02-09 17:21:02 +03:00
Julia Radzhabova f667823e07 [DE] Show preview for list levels 2021-02-03 10:32:18 +03:00
Julia Radzhabova 2bd3ee3e54 [DE] Change color palette for forms 2021-01-29 20:28:04 +03:00
Julia Radzhabova 7b3498bc6e [DE] Change color palette for forms 2021-01-29 11:20:06 +03:00
Julia Radzhabova c295698704 Refactoring color buttons 2021-01-21 22:48:27 +03:00
Julia Radzhabova 70b6a5b3cb
Merge pull request #663 from ONLYOFFICE/feature/bug-42912
Feature/bug 42912
2021-01-20 12:44:27 +03:00
Julia Radzhabova ed0f0ea4eb Add icons 2021-01-19 20:41:46 +03:00
Julia Radzhabova e8eba05a54 Merge branch 'release/v6.2.0' into develop 2021-01-19 18:05:55 +03:00
Julia Radzhabova 9b561aab66 [DE] Bug 42912 2021-01-18 16:41:49 +03:00
Julia Radzhabova 67c1407894 [DE] Fix Bug 47105: add icon for picture control 2021-01-16 19:16:52 +03:00
Julia Radzhabova 86e628b6b6 Add new chart types 2021-01-14 12:57:22 +03:00
Julia Radzhabova 03f75be8b9 [DE] Add editing wrap boundary to toolbar 2021-01-13 16:51:55 +03:00
Julia Radzhabova b51aec35cf Remove caption from chart type menu 2021-01-13 14:14:36 +03:00
Julia Radzhabova f13c8ed33d [DE] Fix Bug 48107 2020-12-24 11:50:09 +03:00
Julia Radzhabova b3119b7c18 Merge branch 'release/v6.1.0' into develop 2020-11-26 19:17:55 +03:00
Julia Radzhabova 967d90f82c [DE] Fix Bug 47619 2020-11-22 21:10:37 +03:00
Julia Radzhabova 460ff7e6f3 Merge branch 'feature/de-new-controls' into develop 2020-10-31 19:11:19 +03:00
Julia Radzhabova fa3b68e212 [DE] Remove adding forms from insert tab 2020-10-07 16:22:31 +03:00
Julia Radzhabova 833f4058e7 [DE] Fix forms tab 2020-10-07 14:20:14 +03:00
Julia Radzhabova c35bf4bdcd [DE] Add Forms tab 2020-10-07 10:43:34 +03:00
Julia Radzhabova aecdd722af [DE] Hide new content controls 2020-10-01 13:39:58 +03:00
Julia Radzhabova b76e5ce940 [DE] Add icons 2020-09-28 15:37:43 +03:00
Julia Radzhabova 9140de31ef [DE] Refactoring line numbers 2020-09-27 23:44:54 +03:00
Julia Svinareva 83aeabb623 [DE] Line Numbers
Автор: Julia Svinareva <julia.svinaryova@onlyoffice.com>
Дата: 19 сентября 2019 г. 10:20:21
2020-09-27 21:44:19 +03:00
Julia Radzhabova 19eb8e41d2 [PE] Add icons to button menu and context menu 2020-08-20 16:55:06 +03:00
Julia Radzhabova 50dec94149 [DE] Shift text in menu items with icons ( + all context menu). 2020-08-18 14:50:10 +03:00
Julia Radzhabova ffca06badb [DE] Add icons to button menu and context menu 2020-08-18 14:02:44 +03:00
Julia Radzhabova 423dc2c0ff [DE] Add new content controls 2020-06-22 20:15:47 +03:00
JuliaSvinareva af9eb000d9 [All] Update jquery (fix bugs) 2020-06-05 16:10:48 +03:00
Julia Radzhabova e3dd2bc5dd Merge branch 'feature/chart-svg-icons' into develop 2020-05-06 18:20:30 +03:00
Julia Radzhabova fd5c8d5f79 [DE] Fix svg icon for chart type 2020-05-06 17:17:03 +03:00
Julia Radzhabova 97c1e56964 Merge branch feature/Bug_36585 into develop 2020-03-12 11:53:39 +03:00
Julia Radzhabova b20217d187 [DE] Bug 36585: insert date/time 2020-03-03 11:08:15 +03:00
Julia Radzhabova f4aee180e9 [DE] Use svg icons for chart type 2020-01-31 13:53:58 +03:00
Julia Radzhabova 55c8f61a17 [DE] Hide adding content controls (#314) 2020-01-24 16:39:08 +03:00
Julia Radzhabova 90c33eebcd Merge branch 'release/v5.5.0' into feature/de-list-settings 2019-12-20 11:53:55 +03:00
Julia Radzhabova f714a26da7 Change color scheme by index 2019-12-19 11:00:49 +03:00
Julia Radzhabova 3585f70ccc [DE] Add settings for multilevel list 2019-12-17 17:25:12 +03:00
Julia Radzhabova 8a3edb0239 [DE] Show settings for numbered list 2019-12-17 14:52:30 +03:00
Julia Radzhabova 969a248690 Merge branch 'develop' into feature/de-list-settings 2019-12-17 13:29:39 +03:00
Julia Radzhabova d207cab626 [DE] Fix selection for multilevel list 2019-12-17 13:15:51 +03:00
Julia Radzhabova 408afd6f7e [DE] Add bullet settings 2019-12-04 10:05:29 +03:00
Julia Radzhabova 8c924f27f8 Update translation. Bug 43660 2019-12-02 13:32:56 +03:00
Julia Radzhabova 08daab14b1 Fix toolbar icons 2019-11-29 14:46:58 +03:00
Maxim Kadushkin 670b6cf2c6 merge with develop 2019-11-28 17:11:18 +03:00
Julia Radzhabova 8027645de5 Merge branch 'develop' into feature/compare 2019-11-28 12:51:56 +03:00
Maxim Kadushkin 88299b78ac [sprite] removed unused resources 2019-11-27 20:15:54 +03:00
Julia Radzhabova 35619396f5 [DE] Fix locking for content controls 2019-11-22 10:43:56 +03:00
Julia Radzhabova d433d525bb [DE] Fix Bug 40362, Bug 43365, Bug 42936 2019-11-21 17:29:39 +03:00
Maxim Kadushkin 8a7aa454ac [DE] build icon sprite from source images 2019-11-21 10:58:05 +03:00
Maxim Kadushkin 5238c494ae [DE SSE] removed unused buttons 2019-11-20 17:58:55 +03:00
Julia Radzhabova 8c4d467b52 [DE] Draw/Erase table 2019-11-20 17:10:32 +03:00
Maxim Kadushkin fa5c9d5626 [all] changed 'notify' button state 2019-11-20 12:42:39 +03:00
Julia Radzhabova 508e81a7d1 Merge branch 'develop' into feature/de-controls 2019-11-19 13:24:07 +03:00
Julia Radzhabova db8a18486d [DE] Refactoring control settings, add translation 2019-11-19 13:12:38 +03:00
Julia Radzhabova e47015cc18 Move chart data to common 2019-11-18 13:40:10 +03:00
Julia Radzhabova b811606de9 Merge branch 'develop' into feature/remove-comments 2019-11-15 11:52:22 +03:00
Julia Radzhabova 01ff598622 Merge branch 'develop' into feature/de-controls 2019-11-14 13:53:46 +03:00
Julia Radzhabova 769fa9a611 Merge branch 'develop' into feature/compare 2019-11-14 12:47:19 +03:00
Julia Radzhabova eb19033e23 Add icon for symbol table 2019-11-12 14:57:26 +03:00
Julia Radzhabova 73f268aa54 Add symbol table dialog 2019-11-08 11:34:53 +03:00
Julia Radzhabova 322ecad082 Update translation 2019-11-07 09:57:08 +03:00
Julia Radzhabova cfb06354ca Refactoring add/remove comments buttons: change icons, change caption of buttons on Collaboration tab. 2019-11-06 17:22:12 +03:00
Julia Radzhabova d2abb4c455 [DE] Add content controls (picture, checkbox, combobox, dropdown list, date picker) 2019-11-05 15:46:04 +03:00
Maxim Kadushkin 4a0e4a5c2a [DE] restore 'image' icons instead of 'svg' in toolbar 2019-10-21 16:56:38 +03:00
Maxim Kadushkin 891e3435d4 [DE] applied 1.5x icons on toolbar (svg + png) 2019-10-15 16:11:19 +03:00
Julia Radzhabova 9e9a60c466 Merge branch 'develop' into feature/compare 2019-10-09 17:02:05 +03:00
Julia Radzhabova 8917a7a553 [DE] Set different tooltips for break button and it's menu 2019-09-25 16:54:36 +03:00
Julia Radzhabova a7be228c60 [DE] Optimize textart loading 2019-09-03 13:32:06 +03:00
Julia Radzhabova d7f435a0f0 [DE] Refactoring loading chart types 2019-08-30 17:55:29 +03:00
Maxim Kadushkin 81986eb1bc [DE] refactoring. toolbar's component rendering 2019-08-22 17:28:26 +03:00
Julia Radzhabova 4b5db261b5 Change values for color scheme (use names) 2019-08-21 12:16:32 +03:00
Julia Radzhabova 61ed3059e2 Show current color scheme 2019-08-20 15:56:29 +03:00
Julia Radzhabova dcab25cdd8 Fix Bug 42475 2019-08-20 12:54:51 +03:00
Julia Radzhabova 9b0047189d [DE] Compare two documents 2019-08-13 17:40:52 +03:00
Julia Radzhabova 17a0c03e4c [PE] Add translation 2019-08-01 15:31:37 +03:00
Julia Radzhabova ee15f9d250 Fix inserting image from storage 2019-07-29 15:50:55 +03:00
Julia Radzhabova 15aac51ab4 Menu component: refactoring, adjust menu to browser height 2019-06-21 10:46:00 +03:00
Julia Radzhabova 20a45dda5f Menu component: change scroll 2019-06-20 14:32:10 +03:00
Julia Radzhabova 152a8d53f3 Merge branch 'feature/watermark' into develop 2019-06-19 11:30:46 +03:00
Julia Radzhabova 45a82b8442 [DE] Watermark: save language settings 2019-06-18 16:20:52 +03:00
Julia Radzhabova 1fcc5190e5 [DE] Change watermark button 2019-06-18 12:35:01 +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 24ecdef872 [SSE] Add translation for header/footer settings 2019-05-28 13:00:42 +03:00
Julia Radzhabova 5b3ede3a79 [DE] Add watermark settings 2019-04-05 14:28:51 +03:00
Julia Radzhabova f2278f5cd6 [DE] Fix Bug 40896 (fix for commit 8765f5cc44) 2019-03-21 12:44:09 +03:00
Julia Radzhabova 63a06b9d19 [DE] Add option for align objects, distribute objects 2019-02-12 15:31:27 +03:00
Julia Radzhabova 984f1937f8 Fix Bug 40560 2019-02-12 14:48:27 +03:00
Maxim Kadushkin 9b5ae84f58 Merge branch 'feature/custom-header-view' into develop 2019-02-07 16:00:33 +03:00
Julia Radzhabova 89a704950c Branding refactoring 2019-02-07 13:18:56 +03:00
Julia Radzhabova 048b8480ce Merge branch 'hotfix/v5.2.8' into develop 2019-02-05 16:43:52 +03:00
Julia Radzhabova 1767ba0ae8 Add parameter customization.compactHeader for compact header view (not for desktop) 2019-01-31 16:41:29 +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 d06e19d543 Merge branch 'feature/desktop-header-view' into develop 2019-01-14 17:01:46 +03:00
Julia Radzhabova 34700233a6 [DE] Add blank page 2018-11-20 12:57:29 +03:00
Julia Radzhabova 888f2880a7 [DE][SSE] Disable buttons on start 2018-10-31 15:47:20 +03:00
Julia Radzhabova c62858944f Enable/disable downloading and printing for different disconnections. Add Asc.c_oAscError.ID.EditingError error. 2018-10-25 16:19:29 +03:00
Julia Radzhabova 3bd78060dc Load image from storage 2018-10-03 14:00:08 +03:00
Julia Radzhabova f671569c88 Merge branch 'release/v5.2.0' into develop 2018-09-28 13:47:04 +03:00
Julia Radzhabova 48fa05b250 For Bug 38948: disable print button on start in the desktop header 2018-09-25 17:09:59 +03:00
Julia Radzhabova 88998b07aa Set header layout as in the desktop editors 2018-09-25 13:46:28 +03:00
Julia Radzhabova 67b742c412
Merge pull request #114 from ONLYOFFICE/feature/highlight-forms
Feature/highlight forms
2018-08-09 12:32:19 +03:00
Julia Radzhabova 557721ab8d Fix Bug 38301 2018-07-24 15:56:05 +03:00
Julia Radzhabova 62f1f3de13 [DE] Set highlight settings for all content controls 2018-07-23 17:39:53 +03:00
Julia Radzhabova 43bad93bb1 Merge branch 'develop' into feature/sse-layout 2018-07-18 14:08:43 +03:00
Julia Radzhabova 6c4e7cf566
Merge branch 'develop' into hotfix/v5.1.5 2018-07-18 10:03:33 +03:00
Julia Radzhabova 685a0a42d3 [SSE] Add layout tab 2018-06-28 12:27:11 +03:00
Julia Radzhabova ae60e24aad [DE] Add modifyContentControl parameter to permissions 2018-06-26 15:46:49 +03:00
Julia Radzhabova c6b5612dcc Update translations 2018-06-14 10:22:41 +03:00
Julia Radzhabova 850148f21f [DE] Fix Bug 36583 2018-05-23 10:43:10 +03:00
Maxim Kadushkin 345e19e135 [All] refactoring tabs redering and selection 2018-05-16 17:41:47 +03:00
Julia Radzhabova 869bc1a7a6 [DE] Show File and Plugins tabs in view mode 2018-05-15 15:37:26 +03:00
Maxim Kadushkin 326e5bfa98 [All] correction z-order for synchronize tooltip 2018-04-24 20:07:04 +03:00
Maxim Kadushkin dbf06b62fe [ALL] added menu for 'options' button 2018-03-21 14:28:28 +03:00
Maxim Kadushkin 03e6994738 Merge branch 'develop' into feature/desktop-new 2018-03-14 18:08:19 +03:00
Maxim Kadushkin 7fd2497462 Merge branch 'release/v5.1.0' into develop 2018-03-14 17:59:24 +03:00
Julia Radzhabova dc9158bc7b [DE] Fix Bug 37059 2018-03-05 12:28:37 +03:00
Maxim Kadushkin 99a7be61c6 merge with develop 2018-03-04 23:41:58 +03:00
Pavel Lobashov 06da18bf2d Update copyright to 2018 2018-03-01 15:16:38 +03:00
Julia Radzhabova 9d1bf1199b [DE] Bug 36827 2018-02-26 17:38:35 +03:00
Maxim Kadushkin 09b9947051 [DE] defined button to indicate coauth changes 2018-02-26 16:31:34 +03:00
Maxim Kadushkin 6d0a353d78 [Common] refactoring. defined $icon element for a button 2018-02-26 16:23:07 +03:00
Maxim Kadushkin fc6c6c2cb8 refactoring 2018-02-25 01:19:36 +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 c172b0c69d [DE] Change name and layout for Links tab. 2018-02-16 12:14:20 +03:00
Maxim Kadushkin 5f1b291886 [DE][PE][SSE] synchronize extra buttons state through events 2018-02-16 02:56:17 +03:00
Maxim Kadushkin 0fb072b9fa refactoring. created controller for set of buttons 2018-02-13 17:37:22 +03:00
Julia Radzhabova 1954fa34f3 [DE][PE] Bug 36801. 2018-02-07 15:14:20 +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
Julia Radzhabova bb36c63c13 [DE] Added print, save, undo, redo buttons and user name to header panel. 2018-01-24 13:57:58 +03:00
Julia Radzhabova 6ee6336001 Merge branch 'develop' into feature/table-of-contents 2018-01-16 11:12:47 +03:00
Julia Radzhabova 833f9fc1b1 Merge branch 'hotfix/v5.0.7' into develop 2018-01-15 16:11:11 +03:00
Julia Radzhabova 8ca83c7144 [DE] Added hyperlink button to the Links tab. 2017-12-26 10:32:52 +03:00
Julia Radzhabova be416c5ed2 Add Note editing button to the Links tab. 2017-12-25 15:55:26 +03:00
Julia Radzhabova db8840f4ec [DE] Added Links tab, added inserting and updating table of contents. 2017-12-23 11:33:49 +03:00
Julia Radzhabova 14d06a5f95 [DE] AscCommon.sdtlocktype -> Asc.c_oAscSdtLockType, AscCommon.sdttype -> Asc.c_oAscSdtLevelType 2017-12-15 11:50:56 +03:00
Julia Radzhabova 4d213595ca [DE] AscCommonWord -> AscCommon for woring with class CContentControl. 2017-12-14 15:13:40 +03:00
Julia Radzhabova e7b722c021 [DE] Updated icons. Added context menu for content controls. 2017-12-13 16:52:14 +03:00
Julia Radzhabova eb3efa3778 [DE] Insert content controls. 2017-12-12 14:14:27 +03:00
Julia Radzhabova d1e3692e48
Merge branch 'develop' into hotfix/v5.0.6 2017-12-11 13:24:21 +03:00