Commit graph

349 commits

Author SHA1 Message Date
Julia Radzhabova bbc6417a4d Fix Bug 37106 (appeared due to Bug 35896). 2018-03-05 16:28:53 +03:00
Maxim Kadushkin 99a7be61c6 merge with develop 2018-03-04 23:41:58 +03:00
Julia Radzhabova 1b75d2035e [Common] Bug in rendering chat and header panel when user id contains special characters. 2018-03-02 17:48:24 +03:00
Pavel Lobashov 06da18bf2d Update copyright to 2018 2018-03-01 15:16:38 +03:00
Julia Radzhabova 68ae26ac5d Fix Bug 36870 2018-02-28 18:04:11 +03:00
Maxim Kadushkin 19b0d19792 [common] centered document title 2018-02-28 16:31:59 +03:00
Maxim Kadushkin 9dcf65d8df [common] added coauth icons to header's 'save' button 2018-02-28 16:24:48 +03:00
Maxim Kadushkin 39f29c5ef8 [common] lock/unlock header buttons on file menu events 2018-02-23 00:19:40 +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 6d385730b1 [Common] make created buttons disabled 2018-02-16 02:46:45 +03:00
Julia Radzhabova f3c3ead61c Fix Bug 36883. 2018-02-14 17:11:28 +03:00
Julia Radzhabova 104ce55de4 [Common] Refactoring 2018-02-13 17:52:06 +03:00
Julia Radzhabova aabbc9c8fd [DE][SSE] Open TXT: preview data bloks (as csv). 2018-02-13 17:01:13 +03:00
Maxim Kadushkin 8be206fa33 Merge branch 'develop' into feature/desktop-new 2018-02-13 11:26:16 +03:00
Julia Radzhabova c6e4aedae2 [DE][SSE] Open CSV/TXT: preview data bloks. 2018-02-13 10:52:48 +03:00
Julia Radzhabova c97e7cfdbe [DE][SSE] Open CSV/TXT: use perfect-scrollbar in the preview panel, load data blocks (for future use) 2018-02-10 15:50:29 +03:00
Julia Radzhabova 0f2e985634 Fix Bug 36742. 2018-02-09 17:26:34 +03:00
Julia Radzhabova 22237f9634 Fix Bug 36885. 2018-02-08 18:22:32 +03:00
Julia Radzhabova c6e333833f [DE] Check message referer in frames. 2018-02-08 18:14:30 +03:00
Julia Radzhabova 69d8618bf7 Change style for buttons in the advanced settings dialog. 2018-02-07 14:15:03 +03:00
Julia Radzhabova a1db2fac69 Fix Bug 36868. 2018-02-07 13:57:46 +03:00
Maxim Kadushkin 159b26aac5 fix bug 36857 2018-02-07 11:11:58 +03:00
Julia Radzhabova 11a3706785 Added "Close File" button to the password dialog. Send api event "onRequestClose" when Close File (or Esc) is selected. 2018-02-06 13:54:40 +03:00
Maxim Kadushkin f328e83a4f refactoring 2018-02-03 16:10:38 +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
Maxim Kadushkin 826ac6aef1 new design changes 2018-01-23 20:35:16 +03:00
Julia Radzhabova 4be85e3576 [DE] Bug in event registering. 2018-01-23 17:26:13 +03:00
Julia Radzhabova 160c8e4821 Fix Bug 36522. 2018-01-22 13:16:17 +03:00
Julia Radzhabova 833f9fc1b1 Merge branch 'hotfix/v5.0.7' into develop 2018-01-15 16:11:11 +03:00
Julia Radzhabova 814c68c7ce Fix Bug 36666. 2018-01-15 11:20:43 +03:00
Julia Radzhabova 419d00f2db Review changes refactoring. 2017-12-13 16:53:00 +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 654585df8e Fix hiding left plugins panel in the desktop app. 2017-12-06 14:25:29 +03:00
Julia Radzhabova 662a7e0c20 [DE] Disable/enable plugins left panel when review mode is changed. 2017-12-01 14:50:25 +03:00
Julia Radzhabova 26aa0afc45 Signature refactoring. 2017-11-28 15:54:12 +03:00
Julia Radzhabova 16c1af8a2b Refactoring signatures: enable adding invisible signature when document is signed. 2017-11-28 15:52:30 +03:00
Julia Radzhabova ea6ca8e602 Signature refactoring. 2017-11-28 15:50:11 +03:00
Julia Radzhabova 0a50b3ac3d [PE] Don't add visible signature for presentation editor. 2017-11-28 15:48:45 +03:00
Julia Radzhabova e53e185f36 [Common] Sign dialog: don't sign when certificate in undefined. 2017-11-28 15:33:13 +03:00
Julia Radzhabova 9fcd4314dd [DE] Refactoring sing dialog. 2017-11-28 15:32:33 +03:00
Julia Radzhabova d48e76e5c6 [DE] Change signature settings layout in the right panel. 2017-11-28 15:30:26 +03:00
Julia Radzhabova 4da0fe1938 [DE] Change layout for protect file menu. 2017-11-28 15:30:10 +03:00
Julia Radzhabova ceb0cd4b5e [DE] Refactoring signature settings in the right and left panels. 2017-11-28 15:29:14 +03:00
Julia Radzhabova abdaa3ede6 [DE] Update translations. 2017-11-28 15:25:06 +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 f49404e8b5 Feature/new toolbar signature 2017-11-27 14:15:10 +03:00
Julia Radzhabova 74c000c941 Signature refactoring. 2017-11-24 14:47:48 +03:00
Julia Radzhabova 493a464076 Refactoring signatures: enable adding invisible signature when document is signed. 2017-11-23 16:29:05 +03:00
Julia Radzhabova ae40346e26 Signature refactoring. 2017-11-21 11:34:38 +03:00
Julia Radzhabova 9641ba6e8b [PE] Don't add visible signature for presentation editor. 2017-11-19 10:38:37 +03:00
Julia Radzhabova 9769137252 [Common] Sign dialog: don't sign when certificate in undefined. 2017-11-17 12:08:40 +03:00
Julia Radzhabova cad4ab9cb5 [DE] Refactoring sing dialog. 2017-11-17 11:02:29 +03:00
Julia Radzhabova 354e9d1a9b [DE] Change signature settings layout in the right panel. 2017-11-16 16:06:55 +03:00
Julia Radzhabova 781030ed3d [DE] Change layout for protect file menu. 2017-11-16 12:43:21 +03:00
Julia Radzhabova 1bcb080cf7 [DE] Refactoring signature settings in the right and left panels. 2017-11-15 15:52:37 +03:00
Julia Radzhabova c2f360fb0c [DE] Update translations. 2017-11-15 11:11:50 +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 694e739ad9 [PE][SSE] Change layout for co-editing mode option in the Collaborative tab. 2017-11-07 15:00:58 +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 844b287c30 Collaboration tab: added description for co-editing mode and review mode options. 2017-10-19 15:11:51 +03:00
Julia Radzhabova b7d6e75ed6 Update icons for collaboration tab. 2017-10-18 15:55:32 +03:00
Oleg Korshul c8a12f7dba new plugins scheme (system & parallel working) 2017-10-17 18:08:12 +03:00
Julia Radzhabova 8cce90d8f0 Hide Plugins tab when no plugins. Hide Review tab when no buttons on this tab (for the future). 2017-10-12 17:25:47 +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 9217de510c [DE] Disable buttons on the collaborative tab depending on config. 2017-10-11 17:52:04 +03:00
Julia Radzhabova b638710824 Merge branch 'hotfix/v5.0.2' into feature/collaboration-tab 2017-10-11 13:18:39 +03:00
Julia Radzhabova cae3819434 [DE] Added Chat button to the collaborative tab in the toolbar. 2017-10-10 15:14:27 +03:00
Julia Radzhabova 1577c8a26e [DE] Added version history to the collaboration tab. 2017-10-09 15:37:12 +03:00
Julia Radzhabova 7d1a4e14c9 [DE] Remove spellcheck and document language buttons from the toolbar collaboration tab. 2017-10-09 15:03:50 +03:00
Julia Radzhabova 25403d1c55 [DE] Set initial state for Co-editing mode menu in the toolbar. 2017-10-09 13:32:19 +03:00
Julia Radzhabova 32267aa6ab [DE] Added tab Collaboration. 2017-10-07 16:06:51 +03:00
Alexey Golubev fce84eef7a v5.0.1 2017-10-05 14:48:08 +03:00
Julia Radzhabova f37d4b53ac Set full plugins list to sdk, but add buttons to the toolbar using "EditorsSupport" field . 2017-10-03 20:42:41 +03:00
Julia Radzhabova 161bd0ee3d Fix Bug 35896. 2017-09-28 14:02:33 +03:00
Julia Radzhabova 73f5efae27 Merge branch 'release/v5.0.0' into develop 2017-09-19 17:44:29 +03:00
Julia Radzhabova 876171af9c Change click on header logo: click only on the image. 2017-09-19 15:42:44 +03:00
Julia Radzhabova 405fe55461 Open "customization->logo->url" when click on the header logo. 2017-09-19 12:16:59 +03:00
Julia Radzhabova cdf53c398c Fix Bug 35860. 2017-09-18 15:13:36 +03:00
Julia Radzhabova f5a3a86ba0 Fix Bug 35860. 2017-09-18 14:38:24 +03:00
Julia Radzhabova 1cbc937e05 [DE] Select default font when opened sign dialog. 2017-09-13 11:34:29 +03:00
Julia Radzhabova ad866734b6 [DE] SignDialog, SignSettingsDialog ->Common. 2017-09-13 11:33:33 +03:00
Julia Radzhabova 4eaf251ae5 Set full plugins list to sdk, but add buttons to the toolbar using "EditorsSupport" field . 2017-09-11 15:47:36 +03:00
Julia Radzhabova 8512f5061b Fix Bug 35787. 2017-09-08 14:25:25 +03:00
Julia Radzhabova 196bc28847 Show error when file password is incorrect. 2017-09-08 11:44:01 +03:00
Julia Radzhabova 03b75e00af [DE] Update hints and translations for review buttons. 2017-09-07 14:47:59 +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 0caa6dfb2f Show error when file password is incorrect. 2017-09-06 16:41:53 +03:00
Maxim Kadushkin e462f5851f [Common] fill plugins panel on collection events 2017-09-04 17:25:45 +03:00
Maxim Kadushkin 1ea8cea665 [Common] fill plugins panel on collection events 2017-09-04 11:12:30 +03:00
Julia Radzhabova 33efca6c3e [DE] Enable spellcheck button in the toolbar in the preview mode for review. 2017-09-01 17:51:39 +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 e265a59dfc Merge pull request #2 from ONLYOFFICE/feature/view-mode-in-review
Feature/view mode in review
2017-08-24 12:29:29 +03:00
Julia Radzhabova 1c3847cea4 [DE] Update translations. 2017-08-24 12:27:02 +03:00
Julia Radzhabova 220b4b8c0e Fix Bug 35721. 2017-08-24 11:44:11 +03:00
Julia Radzhabova 57a8cdadb4 [DE] Set display mode for review. 2017-08-23 17:49:56 +03:00
Julia Radzhabova d01d4e9302 Change top position for centered windows. 2017-08-22 17:49:18 +03:00
Julia Radzhabova 8c7287def2 Merge pull request #1 from ONLYOFFICE/release/v5.0.0
Release/v5.0.0
2017-08-22 14:08:09 +03:00
Julia Radzhabova b6b818db80 Fix Bug 35662. 2017-08-21 10:53:39 +03:00
Julia Radzhabova 3fb4d7abcb [DE][SSE] Show running inside-plugin in the left panel after hiding comment, chat, about panels. 2017-08-18 17:08:45 +03:00
Julia Radzhabova 29d3515dfa Fix Bug 35643. 2017-08-18 15:17:25 +03:00
Julia Radzhabova f75bd72674 [DE] Change translation for track changes button. 2017-08-18 12:09:57 +03:00
Julia Radzhabova 8900b912d7 User icon isn't displayed in FF, Safari on retina. 2017-08-17 17:32:37 +03:00
Julia Radzhabova 4f37e52b8c Fix Bug 35626. refactoring rev. 1843040605. 2017-08-17 16:44:57 +03:00
Julia Radzhabova 1843040605 Fix Bug 35626. 2017-08-17 15:39:28 +03:00
Julia Radzhabova 7624fb1d5d Change plugins window offset. 2017-08-17 10:51:05 +03:00
Julia Radzhabova 5c21e657f0 Fix Bug 35617. 2017-08-17 10:28:17 +03:00
Julia Radzhabova 8fe9914a81 Use new icons for plugins. 2017-08-16 17:40:59 +03:00
Julia Radzhabova 57197575e5 Change name for Plugins tab. 2017-08-16 15:10:19 +03:00
Julia Radzhabova a000f85713 Change maximum size for plugin window. 2017-08-16 10:50:25 +03:00
Maxim Kadushkin 891a4dc91f [Common] locked click on branding logo 2017-08-15 19:30:16 +03:00
Maxim Kadushkin 0bb1d90bb3 [Common] rename document in title 2017-08-15 14:44:59 +03:00
Julia Radzhabova 43cf61dc71 Fix Bug 35408. 2017-08-14 14:46:18 +03:00
Julia Radzhabova 948bb630bf Change hint for printing from toolbar in the view mode. 2017-08-14 14:27:36 +03:00
Julia Radzhabova c57bf7e6be Update translations for plugins. 2017-08-11 14:41:40 +03:00
Maxim Kadushkin dad9b2127d unlocked plugins in toolbar 2017-08-11 14:01:27 +03:00
Julia Radzhabova 1587ae9f2d Fix Bug 35539 + Hide context menu on document caption. 2017-08-08 11:17:18 +03:00
Julia Radzhabova 919cd331d5 Fix bug in viewer. 2017-08-07 17:10:03 +03:00
Julia Radzhabova 5e2ef96d8a [DE][PE] Change title for split cell dialog. 2017-08-07 12:23:03 +03:00
Julia Radzhabova 1873df91b2 [DE] Fix Bug 35499. 2017-08-03 16:46:46 +03:00
Julia Radzhabova bd5ae6e902 Update hint for Add Comment button. 2017-08-02 16:47:40 +03:00
Maxim Kadushkin cb5e41fa78 [Common] setCanRename caused a error before doc name label wasn't created 2017-08-02 14:52:52 +03:00
Maxim Kadushkin 8513705b1e [Common] added 'document rename' 2017-08-01 15:14:19 +03:00
Maxim Kadushkin 6f4e5620fa debug, refactoring 2017-07-21 13:44:49 +03:00
Maxim Kadushkin 7473e641d6 updated translations 2017-07-21 13:44:07 +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 2f54b983a2 [Common] debug styles for header buttons 2017-07-13 12:37:22 +03:00
Maxim Kadushkin 6ea33aa303 [Common] refactoring 2017-07-13 11:50:36 +03:00
Julia Radzhabova c0491e3181 [Comments] Hide tooltip on resolve button when option "show resolved comments" is off. 2017-07-05 15:37:07 +03:00
Maxim Kadushkin 29bdf730c4 changed icon for 'Users ' button 2017-06-30 17:44:19 +03:00
Julia Radzhabova bee1f77a2e Plugins: resize plugin dialog when browser window is resized. 2017-06-26 17:18:11 +03:00
Julia Radzhabova 61a1f877e9 Plugins: set maximum size of the plugins dialog. 2017-06-26 17:17:40 +03:00
Julia Radzhabova c5405c6110 Plugins: add isCustomWindow type to variation. 2017-06-23 17:22:02 +03:00
Julia Radzhabova 04079fec8d [DE] Debug review tab. 2017-06-15 16:35:55 +03:00
Julia Radzhabova c79eb90e08 [DE] Added parameter showReviewChanges to config: open review changes dialog, when showReviewChanges is true (but do not track review changes). 2017-06-09 17:30:52 +03:00
Julia Radzhabova dedd7a50d4 [SSE] Fix Bug 33224. 2017-05-11 11:11:33 +03:00
Maxim Kadushkin 2ab489cd3a [Common] 'back' now has one action 2017-05-04 15:39:17 +03:00
Maxim Kadushkin cee6024b35 implemented interface for desktop app 2017-05-04 15:36:42 +03:00
Maxim Kadushkin f3f7536da0 [Common] refactoring 2017-05-04 15:26:32 +03:00
Julia Radzhabova 26b6527e26 [DE][PE] Refactoring header, toolbar 2017-04-28 13:44:03 +03:00
Julia Radzhabova b1ba645bf6 [PE] Added spell check + changing document language. Moved LanguageDialog to Common. 2017-04-26 11:34:55 +03:00
Maxim Kadushkin 343c014b17 [Common] debug Header's logo 2017-04-25 19:52:51 +03:00
Julia Radzhabova 6d8cceb6b2 [DE] Disable button for selecting language when the languages are not loaded. 2017-04-25 16:17:55 +03:00
Maxim Kadushkin 04b5214015 [Common] updated app logo 2017-04-22 17:51:12 +03:00
Julia Radzhabova cf90639163 Debug with jquery 3.2.1. 2017-04-21 11:22:40 +03:00
Julia Radzhabova 2d9f8abfce Fix Bug 34772. 2017-04-21 11:21:40 +03:00
Julia Radzhabova f0c2692afa [Common] Update underscore to v.1.8.3 2017-04-21 11:15:04 +03:00