Commit graph

109 commits

Author SHA1 Message Date
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 67499c5d21 Fix Bug 34613, Fix Bug 16000 2021-04-20 18:46:41 +03:00
Julia Radzhabova 9b6ec674de
Merge pull request #779 from ONLYOFFICE/release/v6.3.0
Release/v6.3.0
2021-04-02 11:53:39 +03:00
Julia Radzhabova 7e88e04dd2 For Bug 47092 2021-03-30 16:30:01 +03:00
Julia Radzhabova 84d357560e Add method requestClose (show warning on unsaved changes) 2021-03-29 14:30:31 +03:00
Julia Radzhabova d8a5e8244a Update translation 2021-03-12 20:53:03 +03:00
Julia Radzhabova deae069826 Update translation 2021-02-26 17:53:24 +03:00
Julia Radzhabova f9b17e98c8 Update translation 2021-01-23 00:41:17 +03:00
Julia Radzhabova b22e621318 [SSE embedded] Fix Bug 48069 2020-12-25 15:08:01 +03:00
Julia Radzhabova 4bbdef54ff Update translation 2020-12-21 00:13:47 +03:00
Julia Radzhabova 94ed2be03f Update translation 2020-11-27 23:17:48 +03:00
Julia Radzhabova 630ff681ac Update translation 2020-11-20 12:09:15 +03:00
Julia Radzhabova 53948517ac Update translation. Add new languages 2020-11-13 18:39:58 +03:00
Julia Radzhabova 5525d62192 Update translation 2020-11-05 22:21:05 +03:00
Julia Radzhabova f10c9cb196 [Embedded] Fix Bug 47202 2020-10-31 19:53:35 +03:00
Julia Radzhabova 09eba3c88b Merge branch 'release/v6.0.0' into develop 2020-09-17 18:26:57 +03:00
Julia Radzhabova 596ccffeac [SSE] Update translation 2020-09-16 22:10:15 +03:00
Julia Radzhabova 8233cc2388 Merge branch 'release/v6.0.0' into develop 2020-09-09 13:55:55 +03:00
Maxim Kadushkin 61788fa804 [embed] fix bug 33455 2020-09-08 20:40:18 +03:00
Alexander Yuzhin 18c679c9aa [SSE] Fixed display horizontal green lines on skeleton 2020-08-28 14:04:21 +03:00
Julia Radzhabova 6c4d751aef [SSE] Update translation 2020-07-31 23:07:21 +03:00
Julia Radzhabova 5112041426 [Embedded] Send config.encryptionKeys to sdk 2020-05-22 18:40:38 +03:00
Julia Radzhabova 6f093dba4a [PE embedded][SSE embedded] Add parameters to api customization: macros, plugins 2020-05-22 18:34:00 +03:00
Julia Radzhabova 8e2b6c270f
Merge pull request #396 from ONLYOFFICE/hotfix/v5.5.3
Hotfix/v5.5.3
2020-05-08 13:06:21 +03:00
Julia Radzhabova 6573cc7a84 Merge branch 'hotfix/v5.5.1' into develop 2020-04-15 15:04:23 +03:00
Julia Radzhabova ed37202133 [Embedded] Add AccessDeny error 2020-04-07 12:26:19 +03:00
Julia Radzhabova d6cab28e96 Update translation 2020-03-23 15:58:37 +03:00
Julia Radzhabova c13d0dc8e9 Check origin in messages 2020-03-19 17:38:09 +03:00
Julia Radzhabova 6b58820098 Feature/bugfix (#300)
* [PE] Bug 42759

* Fux Bug 44131

* [SSE] Update skeleton
2020-01-15 16:12:53 +03:00
Julia Radzhabova a70eff9cb4 Load sdk scripts from sdkjs directory 2019-12-03 13:29:58 +03:00
Julia Radzhabova f9ac080ba0 Merge branch 'hotfix/v5.4.2' into develop 2019-11-29 16:01:17 +03:00
Julia Radzhabova 61ab8193fb Add parameter customization.goback.requestClose to api: send event onRequestClose instead opening customization.goback.url 2019-11-27 10:22:25 +03:00
Julia Radzhabova 6ceb9a08ad Change message for Asc.c_oAscError.ID.UpdateVersion error 2019-11-15 17:11:59 +03:00
Julia Radzhabova 637a129d63 Add Asc.c_oAscError.ID.UpdateVersion error 2019-11-13 14:14:41 +03:00
Julia Radzhabova a6d4dc6ff7 [Embedded] Fix hiding download button and settings menu. (#263) 2019-11-12 11:05:59 +03:00
Julia Radzhabova f83a20c16c Update translation 2019-10-31 10:48:28 +03:00
Julia Radzhabova 4196914962 [DE][SSE] Send "embedded" parameter to sdk (#259) 2019-10-30 14:48:09 +03:00
Julia Radzhabova 1c83e503a9 Fix skeleton loader (logo icon, presentation loader). Fix embedded mode on IE11. 2019-09-27 18:43:55 +03:00
Julia Radzhabova 8d3ec85ca2 Merge branch 'develop' into feature/optimization 2019-09-18 16:32:26 +03:00
Julia Radzhabova 0c9f29897b
Merge pull request #247 from ONLYOFFICE/hotfix/v5.4.1
Hotfix/v5.4.1
2019-09-18 15:54:52 +03:00
Julia Radzhabova cca8f2aa12 [Embedded] Fix loading translations 2019-09-17 18:23:35 +03:00
Julia Radzhabova 032a460490 [Embedded] Add skeleton loader 2019-09-13 17:40:21 +03:00
Julia Radzhabova 020d2af2cd Fix Bug 42593 2019-08-28 17:29:39 +03:00
Julia Radzhabova 4fa9d82523 Update translations 2019-08-02 11:47:28 +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 bf92472a4a Fix Bug 42160 2019-07-23 15:07:51 +03:00
Julia Radzhabova 8fee6f3db1 Update translations 2019-06-28 15:34:17 +03:00
Julia Radzhabova fe5de5b3e6 Fix loading 2019-05-29 16:21:03 +03:00
Julia Radzhabova 55ee9ef2cc
Merge pull request #176 from ONLYOFFICE/feature/Bug31297
Feature/bug31297
2019-05-29 13:30:37 +03:00