Commit graph

148 commits

Author SHA1 Message Date
Maxim Kadushkin 8a68f2c67b Merge branch 'feature/new-toolbar' 2017-04-21 16:36:16 +03:00
Maxim Kadushkin 679af22f14 [DE, PE] refactoring 2017-04-21 16:36:06 +03:00
Julia Radzhabova 782477aac6 [DE][PE] Update translations. 2017-04-21 14:13:30 +03:00
Julia Radzhabova fde00ea2d2 Update jquery to 3.2.1. 2017-04-21 11:20:40 +03:00
Maxim Kadushkin 60e0feecfc Merge 2017-04-20 16:50:10 +03:00
Maxim Kadushkin 5821be5388 [DE] debug 2017-04-20 13:32:55 +03:00
Maxim Kadushkin 6842d8dfc2 [DE] keep bool value in local storage 2017-04-20 12:27:27 +03:00
Julia Radzhabova 7af77fafb5 [DE] Added default translations. 2017-04-19 15:09:44 +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 e1d553049b [DE] Use event asc_onSpellCheckInit instead of asc_getSpellCheckLanguages. 2017-04-19 11:28:40 +03:00
Julia Radzhabova 0d3f0a88f9 [DE][PE] Prevent browser event, when press Ctrl+S on dialog header. 2017-04-12 12:54:16 +03:00
Julia Radzhabova 9662133543 Fix Bug 34590. [DE] Fix Bug 29356, fix Bug 33671. 2017-04-12 12:49:16 +03:00
Julia Radzhabova aa03115dd2 Fix Bug 34570. + Bug with closing menus by clicking to the input fields: open context menu or combobox, click at any of metric spinners or editable comboboxes -> menu closed, focus goes from spinner/combobox to canvas. 2017-04-12 12:45:16 +03:00
Julia Radzhabova 135e83506a Lost focus from chat window when getting changes from other users. 2017-04-12 12:43:04 +03:00
Julia Radzhabova 65b7e8722b [DE] Changes for fast co-editing mode when count of users>2: always send ' onDocumentStateChange' event , draw '*' in the document caption while user is editing document. 2017-04-12 11:55:46 +03:00
Julia Radzhabova 48453ecda4 [DE] Added option customization->statusBar to config for hiding status bar. 2017-04-12 10:59:28 +03:00
Julia Radzhabova 58ead9e451 Change hint for developer mode. 2017-04-12 10:54:47 +03:00
Julia Radzhabova b89e590e4f Delete unused events and methods. 2017-04-11 17:09:00 +03:00
Julia Radzhabova 321eb290c4 Delete unused method "applyEditRights" from api. 2017-04-11 16:52:31 +03:00
Julia Radzhabova 882a78c0c6 [DE] Added option "customization->commentAuthorOnly". If "true" - user can edit only comments that he created, otherwise he can edit all comments. 2017-04-11 16:43:31 +03:00
Julia Radzhabova d2d9b2b594 Merge feature/force-save. 2017-04-11 16:40:01 +03:00
Julia Radzhabova a48bce7598 Use customization->about for hiding about in the left panel (for licensed users only). Can hide about when asc_getCanBranding() is true. 2017-04-11 15:24:07 +03:00
Julia Radzhabova 528ddf8588 Changes in loading plugins for compatibility with previouse version of server, where plugins.url is used. 2017-04-11 15:12:12 +03:00
Julia Radzhabova 64494a8e6d [DE] Enable chat and comments for opensource version. 2017-04-11 14:43:42 +03:00
Julia Radzhabova 197aec9342 [DE] Use asc_onDownloadUrl event in view mode. 2017-04-11 14:40:18 +03:00
Julia Radzhabova 73525ef2b2 [DE] Check server version 2017-04-11 14:37:45 +03:00
Maxim Kadushkin 26da7307c6 [DE] refactoring 2017-04-10 16:41:07 +03:00
Maxim Kadushkin bf95ec509e [DE] 'view' mode 2017-04-10 16:39:03 +03:00
Maxim Kadushkin 011130b5bd [DE] removed nativeApp flag 2017-04-10 16:11:09 +03:00
Maxim Kadushkin 375b2e400f [DE] processed buttons [Document Language], [Spell checking] 2017-04-04 18:22:02 +03:00
Maxim Kadushkin 240a3c1358 [DE] refactoring 2017-04-03 19:24:24 +03:00
Maxim Kadushkin 2498996442 [DE] opened 'MailMerge' for desktop for portal's files 2017-03-31 13:57:19 +03:00
Maxim Kadushkin ef2b590acb [DE] StatusBar's refactoring. moved functions for changes to ReviewChanges controller 2017-03-29 14:19:57 +03:00
Maxim Kadushkin 5ed32d082c [DE] refactoring 2017-03-29 12:01:34 +03:00
Maxim Kadushkin 7f972c790e [Common] added label for 'Save' operation 2017-03-16 13:24:03 +03:00
Maxim Kadushkin 10a55236d0 [DE] moved "coauthoring users" panel to toolbar 2017-03-13 19:29:05 +03:00
Maxim Kadushkin eed89a5c5b [DE] refactoring 2017-03-06 12:30:18 +03:00
Maxim Kadushkin a75065ecd6 [Common] cherrypicked changes for plugins (6c427e9, 3b82dab, aceb1fe) 2017-03-01 19:19:42 +03:00
Maxim Kadushkin a3a896ac79 [DE] repaired header 2017-03-01 16:33:12 +03:00
Maxim Kadushkin ba2800c14e [DE] 'Review' controls moved to the toolbar 2017-02-27 15:04:18 +03:00
Julia Radzhabova b819a5c0df [DE] Fix Bug 33889. 2017-02-07 18:16:17 +03:00
Maxim Kadushkin 4de7a13fc5 merge with default 2017-01-23 14:04:37 +03:00
Alexander.Trofimov 126a0c9c4b change license to 2017 2017-01-17 17:58:08 +03:00
Alexander Yuzhin 74080fa082 Merge branch 'develop' into feature/new-mobile 2016-12-28 13:03:05 +03:00
Alexey Golubev da8c914a01 Merge tag 'v4.2.3' into develop
v4.2.3 v4.2.3
2016-12-23 14:23:17 +03:00
Julia Radzhabova 518c4212a1 New licence type SuccessLimit. 2016-12-20 18:40:43 +03:00
Julia Radzhabova a2c03c3ea0 Show co-authoring mode settings regardless of the license. 2016-12-20 17:29:37 +03:00
Julia Radzhabova 1ee50da033 Merge branch 'feature/interface-customizer' into develop 2016-12-08 12:14:41 +03:00
Alexander Yuzhin e868764f93 Merge branch 'develop' into feature/new-mobile 2016-12-02 13:44:01 +03:00