Commit graph

223 commits

Author SHA1 Message Date
Julia Radzhabova df4926136c Merge branch 'release/v7.0.0' into develop 2021-12-07 23:49:59 +03:00
Julia Radzhabova ddf2be862c [Embed] Fix Bug 54128 2021-12-07 20:28:43 +03:00
Julia Radzhabova 86f10c9133 Merge branch 'release/v7.0.0' into develop 2021-12-07 18:49:59 +03:00
Julia Radzhabova 0120d6aaba Update translation 2021-12-03 17:43:58 +03:00
Julia Radzhabova ead3de7b22 Update translation 2021-11-26 18:03:35 +03:00
Julia Radzhabova fa284ab2c7 Update translation 2021-11-26 17:29:54 +03:00
Julia Radzhabova c1b8e34f9e [Embedded][Forms] Fix Bug 54104 2021-11-26 14:10:44 +03:00
Julia Radzhabova 067181a056 [DE forms][Embedded] Fix Bug 53981 2021-11-23 14:35:22 +03:00
Julia Radzhabova ac17a5c8a6 Update translation 2021-11-19 16:16:45 +03:00
Julia Radzhabova 711c9f0f80 Update translation 2021-11-19 15:50:23 +03:00
Julia Radzhabova 308ec711c8 Merge branch 'release/v7.0.0' into develop 2021-11-19 15:34:25 +03:00
Julia Radzhabova 3830de776e Update translation 2021-11-12 17:52:09 +03:00
Julia Radzhabova b33a8971c3 Update translation 2021-11-12 17:30:35 +03:00
Julia Radzhabova 6875b60d5e Handle errors 2021-11-01 17:16:20 +03:00
Julia Radzhabova 6fa0b98d30
Merge pull request #1288 from ONLYOFFICE/feature/toolbar-for-embedded
toolbar for embedded
2021-11-01 12:52:12 +03:00
Julia Radzhabova 67b8c6bccd Merge branch 'release/v7.0.0' into develop 2021-10-31 01:40:47 +03:00
Julia Radzhabova 6871cb258c Update translation 2021-10-31 00:10:02 +03:00
OVSharova 91c111637a Change toolbar height 2021-10-28 02:01:32 +03:00
Julia Radzhabova 0e2ca89b9c Merge branch 'release/v7.0.0' into develop 2021-10-19 18:24:19 +03:00
Julia Radzhabova 00384385a4 Add Galician language (gl) 2021-10-19 17:43:08 +03:00
Julia Radzhabova 4e082900d7 Update translation 2021-10-19 17:40:26 +03:00
Julia Radzhabova 8a3c065b8c Update translation 2021-10-08 16:29:30 +03:00
Julia Radzhabova 19617d9943 [Embedded] Customize header logo depending on the license 2021-10-04 21:08:02 +03:00
Julia Radzhabova 7db1746595 Update translation 2021-10-01 14:22:15 +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 84c0740762 Merge branch 'release/v6.5.0' into develop 2021-09-22 23:52:09 +03:00
Julia Radzhabova e89b8fb0d4 Fix logo for embedded viewer 2021-09-22 00:22:43 +03:00
Julia Radzhabova 2881ce85fa Update translation 2021-09-17 20:06:09 +03:00
Julia Radzhabova ed79e76f30 Update translation 2021-09-10 15:56:49 +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 a9212b73ca Update translation. Fix Bug 51479 2021-08-23 20:51:56 +03:00
Julia Radzhabova 3c660d468d Update translation 2021-08-20 18:01:23 +03:00
Julia Radzhabova 2b4855a407 [Embedded] For Bug 50233 2021-08-19 22:03:44 +03:00
Julia Radzhabova 24f31be6e9 Update translation 2021-08-13 17:10:55 +03:00
Julia Radzhabova d978dc52e6
Merge pull request #1064 from ONLYOFFICE/feature/download-file-type
Feature/download file type
2021-08-12 16:01:19 +03:00
Julia Radzhabova 7dcbc69f1b Fix sending filetype 2021-08-09 19:09:59 +03:00
Julia Radzhabova e19e8eb15a Update translation 2021-08-06 17:36:33 +03:00
Julia Radzhabova dab0216a3b Update translation 2021-07-30 15:23:08 +03:00
Julia Radzhabova 92bb409c5a Send file type in events onRequestRestore, onDownloadAs, onRequestSaveAs 2021-07-30 01:01:33 +03:00
Julia Radzhabova 99178866d3 [Embedded] Fix loader logo 2021-07-29 17:08:34 +03:00
Julia Radzhabova e07407c57e [Embedded] Show force save errors 2021-07-27 18:37:37 +03:00
Julia Radzhabova c8e30ead12 Fix Bug 51343 2021-07-27 18:20:52 +03:00
Julia Radzhabova fb325aaa19 Update translation 2021-07-23 20:08:13 +03:00
Julia Radzhabova dd6da8de34 Update translation 2021-07-16 17:07:14 +03:00
Julia Radzhabova d6da7e82a2 Update translation. Fix Bug 51170 2021-07-12 11:50:18 +03:00
Julia Radzhabova 36f718d161 Update translation 2021-06-25 11:46:08 +03:00
Julia Radzhabova 2edcfb779b [PE embedded][SSE embedded] Show loader mask 2021-06-25 00:48:20 +03:00
Julia Radzhabova 8e5073d912 Update translation. Fix Bug 47165. 2021-05-28 15:21:04 +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 6bc911c9db Update translation 2021-05-21 17:35:29 +03:00
Julia Radzhabova e184d4b140 [Embedded] Fix styles 2021-05-20 14:11:58 +03:00
Julia Radzhabova d0a59a5078 Update translation 2021-05-19 17:32:45 +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 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 678139bd79 Update translation 2020-12-21 00:07:23 +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 4310340d76 [PE] Update translation 2020-09-16 20:35:53 +03:00
Julia Radzhabova 8233cc2388 Merge branch 'release/v6.0.0' into develop 2020-09-09 13:55:55 +03:00
Maxim Kadushkin 949eee984a [embed] debug stylesheet 2020-09-08 20:40:54 +03:00
Maxim Kadushkin 61788fa804 [embed] fix bug 33455 2020-09-08 20:40:18 +03:00
Julia Radzhabova c1516b3485 [PE] Update translation 2020-07-31 16:40:27 +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 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
Maxim Kadushkin 670b6cf2c6 merge with develop 2019-11-28 17:11:18 +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
Maxim Kadushkin 09a2df443f [3dparty] version of Less up to 3.10.3 2019-10-18 11:33:36 +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