Commit graph

86 commits

Author SHA1 Message Date
Julia Radzhabova 308ec711c8 Merge branch 'release/v7.0.0' into develop 2021-11-19 15:34:25 +03:00
Julia Radzhabova 6875b60d5e Handle errors 2021-11-01 17:16:20 +03:00
Julia Radzhabova 0e2ca89b9c Merge branch 'release/v7.0.0' into develop 2021-10-19 18:24:19 +03:00
Julia Radzhabova 19617d9943 [Embedded] Customize header logo depending on the license 2021-10-04 21:08:02 +03:00
Julia Radzhabova ad35620a2e Merge branch 'release/v6.5.0' into develop 2021-09-30 19:27:01 +03:00
Julia Radzhabova 31ced630ea [Embedded] Fix logo priority 2021-09-30 18:51:56 +03:00
Julia Radzhabova 4e29149fb5 [Embedded] Change logo: imageEmbedded->image 2021-09-30 16:35:37 +03:00
Julia Radzhabova 1b4cc723ea [Embedded] Fix Bug 49866 2021-09-29 17:45:40 +03:00
Julia Radzhabova fa9fd8d971 [Embedded] Change toolbar height 2021-09-29 16:52:28 +03:00
Julia Radzhabova 7f5fe2274f
Merge pull request #1163 from ONLYOFFICE/release/v6.5.0
Release/v6.5.0
2021-09-07 14:13:11 +03:00
Julia Radzhabova 1a00215605 [Embedded] Fix Bug 52379 2021-09-06 23:20:39 +03:00
Julia Radzhabova cb7bd14600 Add parameters to docinfo 2021-08-31 16:12:30 +03:00
Maxim Kadushkin 5a7421e35d merge release 6.4.0 to develop 2021-08-25 19:02:44 +03:00
Julia Radzhabova 2b4855a407 [Embedded] For Bug 50233 2021-08-19 22:03:44 +03:00
Julia Radzhabova 7dcbc69f1b Fix sending filetype 2021-08-09 19:09:59 +03:00
Julia Radzhabova 92bb409c5a Send file type in events onRequestRestore, onDownloadAs, onRequestSaveAs 2021-07-30 01:01:33 +03:00
Julia Radzhabova e07407c57e [Embedded] Show force save errors 2021-07-27 18:37:37 +03:00
Julia Radzhabova 2edcfb779b [PE embedded][SSE embedded] Show loader mask 2021-06-25 00:48:20 +03:00
Julia Radzhabova 61da979330 Set put_IsAnonymousUser 2021-05-25 16:57:56 +03:00
Julia Radzhabova f52a6b459b [Embedded] Load id and name for anonymous user 2021-05-25 16:40:40 +03:00
Julia Radzhabova 23ac69f964 [Embedded] Change settings menu 2021-05-19 17:29:13 +03:00
Julia Radzhabova 892fd142ac [SSE embedded] Change layout 2021-05-19 16:35:59 +03:00
Julia Radzhabova c143e5b811 [PE embedded] Change layout 2021-05-19 02:34:57 +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 67499c5d21 Fix Bug 34613, Fix Bug 16000 2021-04-20 18:46:41 +03:00
Julia Radzhabova 84d357560e Add method requestClose (show warning on unsaved changes) 2021-03-29 14:30:31 +03:00
Julia Radzhabova f10c9cb196 [Embedded] Fix Bug 47202 2020-10-31 19:53:35 +03:00
Maxim Kadushkin 61788fa804 [embed] fix bug 33455 2020-09-08 20:40:18 +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 ed37202133 [Embedded] Add AccessDeny error 2020-04-07 12:26:19 +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 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 020d2af2cd Fix Bug 42593 2019-08-28 17:29:39 +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 55ee9ef2cc
Merge pull request #176 from ONLYOFFICE/feature/Bug31297
Feature/bug31297
2019-05-29 13:30:37 +03:00
Julia Radzhabova 9c6d950c35 Update translation 2019-05-14 16:55:52 +03:00
Julia Radzhabova f0b40a0911 [PE, SSE embed] Translate embedded viewer. Bug 31297 2019-05-14 15:18:18 +03:00
Julia Radzhabova 8cca5fc839 Merge into develop from release/v5.3.0 2019-03-29 13:05:29 +03:00
Julia Radzhabova c7e5a730da [Embedded] Add c_oAscError.ID.UserDrop error 2019-03-29 12:21:43 +03:00
Maxim Kadushkin 963cd66d01 refactoring 2019-02-22 15:28:39 +03:00
Julia Radzhabova 048b8480ce Merge branch 'hotfix/v5.2.8' into develop 2019-02-05 16:43:52 +03:00
Alexander.Trofimov c10009a464 [copyright] Update Copyright
Limited -> SIA
2019-01-17 16:05:03 +03:00