Commit graph

142 commits

Author SHA1 Message Date
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