Commit graph

500 commits

Author SHA1 Message Date
Julia Radzhabova 84c0740762 Merge branch 'release/v6.5.0' into develop 2021-09-22 23:52:09 +03:00
Julia Radzhabova 0a2d74e72e Disconnect on ConvertationOpenLimitError 2021-09-14 23:17:43 +03:00
Julia Radzhabova 6dcf5c9711 Fix Bug 50962: add parameter to config: permissions->protect // show/hide protect feature 2021-09-09 19:15:29 +03:00
Julia Radzhabova 8c55b7cf64 [DE][PE] Fix Bug 52335 2021-09-07 13:39:38 +03:00
Julia Radzhabova 38def0be24
Merge pull request #1146 from ONLYOFFICE/release/v6.5.0
Release/v6.5.0
2021-09-01 15:22:49 +03:00
Julia Radzhabova 51fad69da6 For Bug 49584 2021-08-31 19:08:04 +03:00
Julia Radzhabova cb7bd14600 Add parameters to docinfo 2021-08-31 16:12:30 +03:00
Julia Radzhabova 34a787f85c Temp fix 2021-08-30 01:04:46 +03:00
Julia Radzhabova baf37cc490 [DE][PE] Fix Bug 49584 2021-08-27 14:42:59 +03:00
Maxim Kadushkin 5a7421e35d merge release 6.4.0 to develop 2021-08-25 19:02:44 +03:00
Julia Radzhabova 704c5a6a00 Refactoring create new file: show "create new" when templates are available in config 2021-08-24 18:30:55 +03:00
Julia Radzhabova a29ab88428 For Bug 50233 2021-08-19 20:58:59 +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 3ab6e18621 Merge branch 'release/v6.4.0' into develop 2021-08-09 13:30:40 +03:00
Julia Radzhabova 8eb3a3f102 [PE] For Bug 40447 2021-07-30 18:57:45 +03:00
Julia Radzhabova 92bb409c5a Send file type in events onRequestRestore, onDownloadAs, onRequestSaveAs 2021-07-30 01:01:33 +03:00
Julia Radzhabova 7ddde2c3fa Add formats to downloadAs method 2021-07-29 18:52:37 +03:00
Julia Radzhabova 5454b06329 Fix version history 2021-07-28 14:23:40 +03:00
Julia Radzhabova d767fa5399 Merge branch 'release/v6.4.0' into develop 2021-07-28 00:03:49 +03:00
Julia Radzhabova 9a5b2487ed [DE][PE] Fix version restore 2021-07-27 22:13:26 +03:00
Julia Radzhabova f305e57396 Fix Bug 51487 2021-07-23 17:40:21 +03:00
Julia Radzhabova 009779620d Bug 44511 2021-07-22 12:40:13 +03:00
Julia Radzhabova 656715a52b Merge branch 'release/v6.4.0' into develop 2021-07-19 14:37:16 +03:00
JuliaSvinareva c4e3899ebd
Merge branch 'develop' into feature/alt-keys 2021-07-16 17:45:18 +03:00
JuliaSvinareva 3a65ac540f Hint manager: fix locking key events, fix click/mousedown handling 2021-07-12 19:33:05 +03:00
Maxim Kadushkin 6641e9419c Merge branch 'hotfix/v6.3.1' into release/v6.4.0 2021-07-04 23:44:01 +03:00
Maxim Kadushkin c93bfb68cb Merge branch 'hotfix/v6.3.1' into develop 2021-07-04 23:39:04 +03:00
JuliaSvinareva a443fcfd2a Merge branch 'develop' into feature/alt-keys 2021-07-01 16:47:01 +03:00
Julia Radzhabova c55886f6e3 [PE] Refactoring disable editing 2021-07-01 01:10:14 +03:00
Julia Radzhabova 52d179153b Always use user info parser 2021-06-30 21:04:25 +03:00
Julia Radzhabova 41d95920a7 Fix loading mask on document opening 2021-06-18 16:53:50 +03:00
JuliaSvinareva eca0abff3b [PE] Hint Manager: add hints in toolbar, right menu 2021-06-16 16:43:51 +03:00
Julia Radzhabova 61da979330 Set put_IsAnonymousUser 2021-05-25 16:57:56 +03:00
Julia Radzhabova d99ad6b1fc Save user id for anonymous user (when user.id is undefined).
[Mobile] Fix loading name for guest user
2021-05-25 16:39:12 +03:00
Julia Radzhabova c44a6d4b99 Add autocorrect option: Capitalize first letter of sentence. 2021-05-19 20:53:49 +03:00
Julia Radzhabova 5c7350e28f Support rename for wopi 2021-05-12 19:04:14 +03:00
Julia Radzhabova df1015d826 Refactoring 2021-05-12 14:36:24 +03:00
Julia Radzhabova 59bb490069 Show error if default lang isn't loaded 2021-05-12 12:33:10 +03:00
Julia Radzhabova c14408bd9c Fix wopi messages 2021-05-06 14:37:46 +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 912366279f [PE] FIx hiding notes 2021-04-27 00:04:35 +03:00
Julia Radzhabova 48405d8e76 [PE] Fix customization.hideNotes param 2021-04-26 20:22:00 +03:00
Julia Radzhabova 24110bdac2 [PE] Add settings for notes panel 2021-04-26 19:49:10 +03:00
Julia Radzhabova 67499c5d21 Fix Bug 34613, Fix Bug 16000 2021-04-20 18:46:41 +03:00
Julia Radzhabova c2e0ffb2be Merge branch 'release/v6.3.0' into develop 2021-04-15 11:18:07 +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