Commit graph

306 commits

Author SHA1 Message Date
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
Julia Radzhabova e92d353971 [DE] Fix Bug 36847. 2018-02-07 14:51:19 +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
Julia Radzhabova 4d90badb55 Merge branch 'hotfix/v5.0.6' into feature/v5.0.6-signature 2017-12-06 14:53:09 +03:00
Julia Radzhabova a0ea3d2903 [DE] Signature refactoring. 2017-11-28 15:33:54 +03:00
Julia Radzhabova 9e458a51f8 [DE] Added Protection tab with the ability to encrypt and sign document. 2017-11-28 15:23:37 +03:00
Julia Radzhabova a90f108209 [DE] Change applying the license (disable editing when connections are over the limitations). 2017-11-22 15:20:51 +03:00
Julia Radzhabova 565e0bd750 [DE] Signature refactoring. 2017-11-17 16:11:40 +03:00
Julia Radzhabova 222c0bf74d [DE] Added Protection tab with the ability to encrypt and sign document. 2017-11-15 10:59:06 +03:00
Julia Radzhabova d598aed90d Menu component: added clearAll method. 2017-11-13 11:41:32 +03:00
Julia Radzhabova c02389ab21
Merge branch 'develop' into hotfix/v5.0.3 2017-10-31 20:15:07 +03:00
Julia Radzhabova db3475a6e6 Merge branch 'feature/collaboration-tab' into develop 2017-10-27 16:03:03 +03:00
Julia Radzhabova 03890e6403 Fix Bug 36134. 2017-10-24 15:59:18 +03:00
Julia Radzhabova 32267aa6ab [DE] Added tab Collaboration. 2017-10-07 16:06:51 +03:00
Julia Radzhabova a3117efe05 [DE] Check selected page size preset depending on page orientation. 2017-09-27 14:35:12 +03:00
Maxim Kadushkin b17354f2cc [Common] fix bug 35651 2017-09-08 10:35:47 +03:00
Julia Radzhabova 43222dfa9d Merge pull request #4 from ONLYOFFICE/release/v5.0.0
Release/v5.0.0
2017-09-07 11:49:02 +03:00
Julia Radzhabova c1039d2d77 Synchronize save buttons in the toolbar and left menu. 2017-09-05 10:54:44 +03:00
Julia Radzhabova e86804cbb2 [DE] Fix Bug 35757. Disable save button in the preview mode for review. 2017-09-01 17:48:31 +03:00
Julia Radzhabova 9939a4c15a [DE] Toolbar lock refactoring. 2017-09-01 10:03:11 +03:00
Maxim Kadushkin 5409048345 [Common] fix bug 35651 2017-08-31 11:16:15 +03:00
Julia Radzhabova fe462bd08b Merge pull request #3 from ONLYOFFICE/release/v5.0.0
Release/v5.0.0
2017-08-30 15:07:13 +03:00
Julia Radzhabova 57a8cdadb4 [DE] Set display mode for review. 2017-08-23 17:49:56 +03:00
Julia Radzhabova c5d19bfb89 Fix Bug 35715, fix Bug 35714. 2017-08-23 14:51:27 +03:00
Julia Radzhabova 13b623ef0c Fix Bug 35525. + Set focus to document after "insert table" dialog is closed. 2017-08-23 11:02:04 +03:00
Maxim Kadushkin c76a24beeb unified toolbar's components identifiers 2017-08-08 18:00:55 +03:00
Julia Radzhabova bd5ae6e902 Update hint for Add Comment button. 2017-08-02 16:47:40 +03:00
Maxim Kadushkin 05ce65f5ee implemented 'Download As' for 'preview' mode 2017-07-21 17:55:27 +03:00
Maxim Kadushkin 0a1324217e [Common] added button 'Edit Document' to 'preview' mode 2017-07-21 13:41:56 +03:00
Maxim Kadushkin 86c3493c1c changed header layout for view mode 2017-07-13 12:43:40 +03:00
Maxim Kadushkin cb9b82e0f0 [Common] refactoring 2017-07-10 18:32:33 +03:00
Julia Radzhabova 64355cc7db [DE] Disable comments on toolbar when objects are locked.
[PE] Disable comments on toolbar when no slides.
2017-06-29 15:06:31 +03:00
Julia Radzhabova fae2867431 Disable/enable comment button in the toolbar. 2017-06-28 14:20:49 +03:00
Maxim Kadushkin 64ee1c86bc Merge branch 'feature/new-toolbar' 2017-06-27 11:33:33 +03:00
Maxim Kadushkin 0ec42dad0e [DE] replaced 'insert' buttons 2017-06-26 16:11:50 +03:00
Julia Radzhabova f3c9df235f [DE] Add custom columns. 2017-06-23 17:27:20 +03:00
Julia Radzhabova b16aadf69b [DE] Translate default paragraph styles. 2017-06-23 16:46:10 +03:00
Julia Radzhabova 6d3f1f88f9 [DE] Fix Bug 35084. 2017-06-20 13:12:31 +03:00
Julia Radzhabova 5d40fdc1ed Debug toolbar layout. 2017-06-15 16:18:40 +03:00
Maxim Kadushkin ac59e8b46e [DE, PE] tab 'File' didn't select after 'FileMenu' opened programmatically 2017-04-27 17:34:34 +03:00
Julia Radzhabova 76efc03e39 [DE] Debug image advanced settings. 2017-04-25 16:16:12 +03:00
Julia Radzhabova 293d08c2be [DE][PE] Close toolbar menus when toolbar is collapsed. Collapse toolbar when document context menu is opened. 2017-04-24 17:35:00 +03:00
Julia Radzhabova e2363e519a [DE][PE] Fix loading color palettes in the toolbar menu. 2017-04-24 14:41:51 +03:00
Maxim Kadushkin 096060a55f [DE] implemented Mixtbar 2017-04-22 15:42:52 +03:00
Maxim Kadushkin 679af22f14 [DE, PE] refactoring 2017-04-21 16:36:06 +03:00
Maxim Kadushkin ada56664f3 [DE, PE] refactoring 2017-04-20 17:45:47 +03:00
Maxim Kadushkin 60e0feecfc Merge 2017-04-20 16:50:10 +03:00
Julia Radzhabova 487c26dfe3 [DE] Debug opening in the compact mode. 2017-04-20 14:16:50 +03:00
Maxim Kadushkin 610a47ab75 [DE] debug of compact mode 2017-04-20 13:35:06 +03:00
Maxim Kadushkin 6e867fb9f0 [DE] updated translations 2017-04-20 13:23:50 +03:00
Maxim Kadushkin 6842d8dfc2 [DE] keep bool value in local storage 2017-04-20 12:27:27 +03:00
Julia Radzhabova e24c0e4b38 [DE] Bug with co-editing in strict mode. 2017-04-19 14:24:23 +03:00
Julia Radzhabova ecae264fd3 [DE] Common.localStorage.getItem -> Common.localStorage.getBool. 2017-04-19 14:22:31 +03:00
Julia Radzhabova 24dec9d752 [DE] Bugs with document without styles: update from style, create new style, delete all styles. 2017-04-12 13:00:17 +03:00