Commit graph

1056 commits

Author SHA1 Message Date
Julia Radzhabova 40d535fa4c Fix merge 2021-04-30 00:07:29 +03:00
Maxim Kadushkin 97474af94d Merge branch 'release/v6.3.0' into develop
# Conflicts:
#	apps/common/main/lib/controller/Plugins.js
#	apps/common/main/lib/view/Header.js
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/documenteditor/main/app/view/Toolbar.js
#	apps/documenteditor/main/locale/sl.json
#	apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/presentationeditor/main/locale/ja.json
#	apps/spreadsheeteditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/template/Toolbar.template
#	apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
2021-04-29 23:31:07 +03:00
Julia Radzhabova a12aca655e [DE] Fix Bug 50130 2021-04-29 15:10:57 +03:00
Julia Radzhabova f3e7deb846 [DE] Enable arrange for grouped shapes 2021-04-26 17:03:51 +03:00
Julia Radzhabova b634b638c5 Fix interface plugins 2021-04-24 23:40:06 +03:00
Julia Radzhabova 5a0161b352 [DE] Show current level of list 2021-04-23 17:59:55 +03:00
Julia Radzhabova 1ab9d09675 [DE] Add changing level to multilevel list menu 2021-04-22 12:13:54 +03:00
Julia Radzhabova 67499c5d21 Fix Bug 34613, Fix Bug 16000 2021-04-20 18:46:41 +03:00
Julia Radzhabova 79605f1871 [DE] Fix Bug 49734 2021-04-19 22:40:42 +03:00
Julia Radzhabova 974873a8ed [DE] Fix Bug 49732 2021-04-19 17:01:48 +03:00
Julia Radzhabova eb0a5023b2 [DE] Convert text to table 2021-04-16 00:32:56 +03:00
Julia Radzhabova c2e0ffb2be Merge branch 'release/v6.3.0' into develop 2021-04-15 11:18:07 +03:00
Julia Radzhabova e0ceb8a841 [DE] Fix preview toc 2021-04-13 12:52:19 +03:00
Julia Radzhabova 1799fb270c [DE] Preview for TOC menu 2021-04-13 12:14:15 +03:00
Julia Radzhabova 57b6acfd67 Merge branch 'feature/de-preview-bullets' into develop 2021-04-10 00:37:17 +03:00
maxkadushkin e7933c9c2a
Merge pull request #800 from ONLYOFFICE/feature/pr15-fix-bug-49480
Feature/pr15 fix bug 49480
2021-04-08 19:17:25 +03:00
Maxim Kadushkin a547dabab6 [common] fix bug 49480 2021-04-08 19:02:57 +03:00
Julia Radzhabova 42336eadec Merge branch 'feature/coauth-mode' into develop 2021-04-08 14:36:13 +03:00
Julia Radzhabova f4953e8b99 Show alert for c_oAscError.ID.ForceSaveTimeout error 2021-04-08 12:59:44 +03:00
Julia Radzhabova 2f5e7b4ef7 Use editorConfig.coEditing parameter for collaboration settings 2021-04-08 00:48:16 +03:00
Julia Radzhabova 77cd81322c Merge branch 'feature/sse-from-text' into develop 2021-04-05 11:34:54 +03:00
Julia Radzhabova ff6ed83339 Move changeCoAuthoring parameter to permissions 2021-04-02 11:08:36 +03:00
Julia Radzhabova d5bf62a72d [DE] Add translation for lists 2021-04-01 19:06:21 +03:00
Julia Radzhabova 2b547dc8c5 [DE] Change preview for list types 2021-04-01 18:57:00 +03:00
Julia Radzhabova 553b2daffc [DE] Add api parameters for co-authoring mode 2021-04-01 13:36:08 +03:00
Julia Radzhabova e007a9a7b6 [DE] Fix prev commit 2021-03-30 19:40:02 +03:00
Julia Radzhabova 1e18f144c2 Merge branch 'fix/request-close' into develop 2021-03-30 15:34:56 +03:00
Julia Radzhabova 22fc77c0a4 Fix closing editors 2021-03-29 16:41:49 +03:00
Julia Radzhabova 4da4514e97 [PE][DE] Fix show history 2021-03-29 16:40:05 +03:00
Julia Radzhabova b1d3ba3fc0 Merge branch 'release/v6.3.0' into develop 2021-03-29 16:33:45 +03:00
Julia Radzhabova 84d357560e Add method requestClose (show warning on unsaved changes) 2021-03-29 14:30:31 +03:00
Julia Radzhabova 0e52ef704b Check unsaved changes before onRequestClose event 2021-03-28 23:59:55 +03:00
Julia Radzhabova 9e48347652 Fix translations 2021-03-27 00:36:57 +03:00
Julia Radzhabova 3b901f91e4 Use sdk class 2021-03-26 14:29:16 +03:00
Julia Radzhabova 7311cd0c8c Refactoring open dialog 2021-03-23 16:55:20 +03:00
Julia Radzhabova 1c527c76f5 [DE] Fix Bug 49152 2021-03-18 16:34:08 +03:00
Julia Radzhabova 45f53a954b For Bug 49148 2021-03-18 13:43:44 +03:00
Julia Radzhabova f35e929713 Add permissions for edit/remove comments 2021-03-17 12:02:06 +03:00
Julia Radzhabova 8974612ff4 Change api events: send onDocumentStateChange only after onDocumentReady, don't send false on loading. 2021-03-09 17:06:44 +03:00
Julia Radzhabova b0fedaa13f Merge branch 'master' into release/v6.3.0 2021-03-04 13:51:02 +03:00
Julia Radzhabova c3b0f9c2b6 [DE] Fix new track changes 2021-02-27 12:43:32 +03:00
Julia Radzhabova f76b650704 Merge branch 'feature/list-levels' into develop 2021-02-26 13:46:28 +03:00
Maxim Kadushkin b07a01bb0f [all] hide "Dark theme" option from "View settings" menu 2021-02-21 21:40:41 +03:00
Julia Radzhabova 7014d076a4 Merge branch 'feature/new-track-changes' into develop 2021-02-19 20:35:56 +03:00
Julia Radzhabova 3d088ba86b Fix translation 2021-02-19 20:06:36 +03:00
Julia Radzhabova 5c1b1185dd Delete dark theme tooltip 2021-02-19 20:00:35 +03:00
Julia Radzhabova edefa48180 For Bug 48811 2021-02-19 13:16:19 +03:00
Julia Radzhabova 1bed0d1bf4 Add api parameter customization.hideStartTips: hide theme tooltip 2021-02-17 22:09:50 +03:00
Julia Radzhabova 1dff1aaae3 Show tooltips with dark theme description 2021-02-17 21:11:04 +03:00
Julia Radzhabova 17a1ec78e4 Change synchronize tip component: add new placements 2021-02-17 20:25:30 +03:00