Commit graph

370 commits

Author SHA1 Message Date
Julia Radzhabova b0b0481028 Insert special characters 2020-04-01 21:41:53 +03:00
Julia Radzhabova 308428d83f Fix Bug 44916 2020-03-31 16:49:33 +03:00
Julia Radzhabova 97c1e56964 Merge branch feature/Bug_36585 into develop 2020-03-12 11:53:39 +03:00
Julia Radzhabova f628ca5668 [DE] Insert date-time 2020-03-06 14:18:01 +03:00
Julia Radzhabova b20217d187 [DE] Bug 36585: insert date/time 2020-03-03 11:08:15 +03:00
Julia Radzhabova 9f7306c94b [DE] Fix Bug 44368 2020-01-30 16:30:50 +03:00
Julia Radzhabova f8de67a58f [DE] Bug 42936: fix lock comments in commenting mode, add lock in context menu 2020-01-30 16:30:50 +03:00
Julia Radzhabova 64d8f353ed [DE] Fix Bug 44289 2020-01-27 18:06:26 +03:00
Julia Radzhabova 55c8f61a17 [DE] Hide adding content controls (#314) 2020-01-24 16:39:08 +03:00
Julia Radzhabova e7cec07aad Bug 40362, Bug 43365, Bug 42936 2019-12-20 16:18:17 +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 7b1911e5bd [DE] Fix applying numbering 2019-12-20 11:46:14 +03:00
Julia Radzhabova f714a26da7 Change color scheme by index 2019-12-19 11:00:49 +03:00
Julia Radzhabova 61f2a36fec [DE] Add settings for multilevel list. 2019-12-18 16:48:36 +03:00
Julia Svinareva a77422602d [DE] Fix margins dialog 2019-12-18 11:08:58 +03:00
Julia Radzhabova 3585f70ccc [DE] Add settings for multilevel list 2019-12-17 17:25:12 +03:00
Julia Radzhabova 7b1f56d69f [DE] BulletSettingsDialog -> ListSettingsDialog 2019-12-17 16:02:28 +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 88aa2e5ab7 [DE] Change list settings 2019-12-17 12:32:15 +03:00
Julia Radzhabova 69edbf54dc [DE] Add dialog for bullet settings 2019-12-04 13:35:56 +03:00
Julia Radzhabova 408afd6f7e [DE] Add bullet settings 2019-12-04 10:05:29 +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
Julia Radzhabova 35619396f5 [DE] Fix locking for content controls 2019-11-22 10:43:56 +03:00
Julia Radzhabova 25a9ca56ed [DE] Change events for table drawing 2019-11-21 17:44:29 +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 9199b69881 Refactoring symbol table: change sdk method 2019-11-15 16:57:55 +03:00
Julia Radzhabova 5aed3e8b51 [DE] Fix opening symbol table dialog 2019-11-15 14:42:07 +03:00
Julia Radzhabova b811606de9 Merge branch 'develop' into feature/remove-comments 2019-11-15 11:52:22 +03:00
Julia Radzhabova 475e9c0306 [DE] Add settings for check box. Refactoring symbol table 2019-11-14 16:28:28 +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 5d74f76d4d Fix non-modal mode for symbol table dialog. Update translation 2019-11-12 15:01:59 +03:00
Julia Radzhabova 57e744435a Add translation for symbol table ranges 2019-11-12 14:33:47 +03:00
Julia Radzhabova 5fba110d35 Symbol table refactoring 2019-11-11 17:48:09 +03:00
Julia Radzhabova 28861851fb Symbol table refactoring 2019-11-11 16:45:44 +03:00
Julia Radzhabova 73f268aa54 Add symbol table dialog 2019-11-08 11:34:53 +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 f6ce4273a0 [DE] Add settings for date content control 2019-11-06 14:15:23 +03:00
Julia Radzhabova d2abb4c455 [DE] Add content controls (picture, checkbox, combobox, dropdown list, date picker) 2019-11-05 15:46:04 +03:00
Julia Radzhabova fc4afa4a3a [DE] Disable adding comment to the text in shape for customization->compatibleFeatures parameter 2019-11-01 11:36:32 +03:00
Maxim Kadushkin 2f2bcb516d [all] roolback bugfix 42885 for smooth skeleton 2019-10-29 11:30:08 +03:00
Julia Radzhabova 9e9a60c466 Merge branch 'develop' into feature/compare 2019-10-09 17:02:05 +03:00
Julia Radzhabova b4167ac4b4 [DE] Bug 35506 2019-10-03 18:13:14 +03:00
Julia Radzhabova 0070450272 [DE] Bug 35506 2019-10-02 15:33:42 +03:00
Maxim Kadushkin 2c4a281998 [all] fix toolbar's rendering dependensies 2019-09-25 12:50:58 +03:00
Maxim Kadushkin 6345ebca47 [all] fix bug 42885 2019-09-23 17:26:30 +03:00
Julia Radzhabova 8d3ec85ca2 Merge branch 'develop' into feature/optimization 2019-09-18 16:32:26 +03:00
Julia Radzhabova 822968c6ad [DE] Set interface language as default for watermark 2019-09-16 14:46:03 +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
Julia Radzhabova 36e83f7cb3 Merge branch 'develop' into feature/optimization 2019-08-27 13:48:14 +03:00
Julia Radzhabova f65057491c [DE] Add methods to disable mail merge and version history (use in desktop app) 2019-08-22 17:16:07 +03:00
Julia Radzhabova e9bf021e17 Refactoring loading textarts 2019-08-21 17:08:21 +03:00
Julia Radzhabova 71d1f2a262 Merge branch 'develop' into feature/optimization 2019-08-21 15:04:07 +03:00
Julia Radzhabova 6e93a76a0a [DE] Refactoring styles loading 2019-08-21 10:50:32 +03:00
Julia Radzhabova 61ed3059e2 Show current color scheme 2019-08-20 15:56:29 +03:00
Julia Radzhabova b8b6c9edae Render autoshapes after menu is opened 2019-08-20 14:05:13 +03:00
Julia Radzhabova d74909340b [PE][SSE] Optimize shapes loading 2019-08-20 11:05:52 +03:00
Julia Radzhabova d2709f17c1 [DE] Optimize shapes loading 2019-08-19 17:33:30 +03:00
Julia Radzhabova 960a107e8e Merge branch 'develop' into feature/optimization 2019-08-19 10:27:00 +03:00
Julia Radzhabova 781950c412 [DE] Fill equations on menu opening 2019-08-15 16:51:48 +03:00
Julia Radzhabova cbd293523a [DE] Refactoring math loading 2019-08-15 16:39:48 +03:00
Julia Radzhabova faecea9e11 [DE] Refactoring DataViewSimple. Optimize equation loading. 2019-08-15 15:54:53 +03:00
Julia Radzhabova 4a59da29c2 Add DataViewSimple component. Use for equation rendering 2019-08-15 14:33:50 +03:00
Julia Radzhabova 8ae13a7fde [DE] Add settings for comparison of documents 2019-08-14 11:07:24 +03:00
Julia Radzhabova 2652e09372 Add onRequestMailMergeRecipients event, setMailMergeRecipients method for mail merge 2019-07-29 13:40:07 +03:00
Julia Radzhabova d45d04f0a1 Add onRequestInsertImage event, insertImage method for inserting image from storage 2019-07-26 14:49:53 +03:00
Julia Radzhabova 39bfe54860 Change usage of asc_Print 2019-07-24 16:07:16 +03:00
Julia Radzhabova 4abaffcf88 Change usage of asc_DownloadAs 2019-07-24 11:36:13 +03:00
Julia Radzhabova 152a8d53f3 Merge branch 'feature/watermark' into develop 2019-06-19 11:30:46 +03:00
Julia Radzhabova 1fcc5190e5 [DE] Change watermark button 2019-06-18 12:35:01 +03:00
Julia Radzhabova 4ac3503435 [DE] Get/put watermark settings 2019-06-17 17:05:27 +03:00
Julia Radzhabova e347b92a0f Use ButtonsArray for group of buttons 2019-06-11 10:52:13 +03:00
Julia Radzhabova eae18e94b0 Merge feature/sse-header-footer into develop 2019-05-28 12:42:45 +03:00
Julia Radzhabova 5b3ede3a79 [DE] Add watermark settings 2019-04-05 14:28:51 +03:00
Julia Radzhabova bc21451d4f Use svg icons for autoshapes 2019-04-01 16:10:35 +03:00
Julia Radzhabova 67dd8e1379 [DE] Fix for Commit: c1e1ced4d2
Disable adding comment to document from toolbar (add comment only for text) in commenting mode
2019-03-28 11:47:51 +03:00
Julia Radzhabova c1e1ced4d2 [DE] Disable adding comment to document from toolbar (add comment only for text) 2019-03-21 12:50:12 +03:00
Julia Radzhabova e373415ee9 Fix loading images from storage 2019-02-28 17:34:48 +03:00
Julia Radzhabova 5228ad3d5e Download as dotx/ott, potx/otp, xltx/ots formats 2019-02-21 16:10:37 +03:00
Julia Radzhabova e8bace41c2 Fix Bug 25918 2019-02-19 15:47:50 +03:00
Julia Radzhabova 179a6e4ee5 Merge branch 'develop' into feature/sse-header-footer 2019-02-12 15:27:34 +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 d52a2c6774 Register font events in controllers (not in the component ComboBoxFonts) 2019-02-01 13:13:44 +03:00
Julia Radzhabova 2c7662cd72 Remove customization parameter for hiding header (customization.header) 2019-01-31 17:09:37 +03:00
Julia Radzhabova 1767ba0ae8 Add parameter customization.compactHeader for compact header view (not for desktop) 2019-01-31 16:41:29 +03:00
Julia Radzhabova 703be670ab [DE] Fix Bug 40345 2019-01-31 15:22:55 +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 1e1d1ebd17 Merge branch 'develop' into feature/review-in-viewer 2019-01-15 17:49:00 +03:00
Julia Radzhabova d06e19d543 Merge branch 'feature/desktop-header-view' into develop 2019-01-14 17:01:46 +03:00
Julia Radzhabova b8dc7d4017 [DE] Show review changes in view mode. Add collaboration tab in view mode (change display mode) 2018-12-18 17:27:19 +03:00
Julia Radzhabova 1d2d38ec1e Merge with hotfix/v5.2.4 2018-12-11 16:27:35 +03:00
Julia Radzhabova 41a64bd225 [DE] Add api function for blank page 2018-11-20 17:43:15 +03:00
Julia Radzhabova 34700233a6 [DE] Add blank page 2018-11-20 12:57:29 +03:00
Julia Radzhabova d3690e9264 Fix bug when apply new font (current font name and new name are empty) 2018-11-12 15:20:16 +03:00
Julia Radzhabova 1d3f946653
Merge branch 'develop' into hotfix/v5.2.3 2018-10-30 13:08:21 +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 0525597e79 Fix Bug 39254 2018-10-09 16:15:26 +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 5667132024 [DE] Fix 38604 2018-08-28 17:52:21 +03:00
Julia Radzhabova 00363faadb [DE] Add 'Apply to all' button for content controls settings 2018-08-28 17:37:45 +03:00
Julia Radzhabova ef02ce4ace Fix Bug 38456 2018-08-10 13:46:19 +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 0fa132143c [DE] Update content controls color 2018-08-09 12:26:50 +03:00
Julia Radzhabova ef7a2da5fd [DE] Fix content controls highlighting 2018-08-08 16:51:02 +03:00
Julia Radzhabova 2a254a88d0 [Desktop] Show/hide protect settings depending on sdk settings (use isSignatureSupport, isProtectionSupport) 2018-08-01 19:08:24 +03:00
Julia Radzhabova 996c2f5641 [DE] Enable inserting shapes when shape is selected 2018-07-30 12:12:38 +03:00
Julia Radzhabova 62f1f3de13 [DE] Set highlight settings for all content controls 2018-07-23 17:39:53 +03:00
Julia Radzhabova d8fc456686 Save to pdfa format 2018-07-18 14:07:24 +03:00
Julia Radzhabova 6c4e7cf566
Merge branch 'develop' into hotfix/v5.1.5 2018-07-18 10:03:33 +03:00
Julia Radzhabova 8a319f9e07 Enable saving with password from menu File 2018-06-14 15:17:52 +03:00
Maxim Kadushkin b33382fb67 [All] debug of compact toolbar 2018-05-18 12:59:01 +03:00
Maxim Kadushkin 931011ca42 [All] changed default tab option for compact toolbar 2018-05-17 13:44:46 +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
Julia Radzhabova 902f5d2f5f Merge branch 'hotfix/v5.1.4' into develop 2018-05-14 14:21:55 +03:00
Julia Radzhabova 2e57695d06 [DE desktop] Fix position for style menu 2018-05-07 11:13:41 +03:00
Julia Radzhabova 3d6ebf252c Disable protection feature. 2018-04-28 13:25:41 +03:00
Julia Radzhabova 805f538ec6 [DE] Debug saving changes 2018-04-03 16:41:01 +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 eace54100d [DE] Fix Bug 37170 2018-03-12 12:11:22 +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
Maxim Kadushkin 9f289a6392 [DE] button 'save' disabled in wrong way 2018-03-04 23:25:00 +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 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
Maxim Kadushkin 5f1b291886 [DE][PE][SSE] synchronize extra buttons state through events 2018-02-16 02:56:17 +03:00
Maxim Kadushkin cb82ea8230 [DE PE] refactoring 2018-02-16 02:52:44 +03:00
Maxim Kadushkin 0fb072b9fa refactoring. created controller for set of buttons 2018-02-13 17:37:22 +03:00
Maxim Kadushkin b5a5c97735 hide some buttons for desktop mode 2018-02-07 18:30:45 +03:00