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 |
|
|
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
|
c3fc27031f
|
[PE] [DE] Draw list preview in sdk
|
2021-04-02 23:04:37 +03:00 |
|
|
Julia Radzhabova
|
fc2bcf24bd
|
[PE][SSE] Add api parameters for co-authoring mode
|
2021-04-02 22:36:08 +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
|
1e18f144c2
|
Merge branch 'fix/request-close' into develop
|
2021-03-30 15:34:56 +03:00 |
|
|
Julia Radzhabova
|
8d54a7d1fb
|
[PE] Fix themes list
|
2021-03-30 13:23:23 +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
|
78229a2bab
|
Merge branch 'develop' into feature/comment-permissions
|
2021-03-28 22:18:19 +03:00 |
|
|
Julia Radzhabova
|
6321f579d9
|
[PE] For Bug 49152
|
2021-03-27 01:21:17 +03:00 |
|
|
Julia Radzhabova
|
3b901f91e4
|
Use sdk class
|
2021-03-26 14:29:16 +03:00 |
|
|
Julia Radzhabova
|
36e6394f2b
|
[PE] Show version history
|
2021-03-24 10:39:09 +03:00 |
|
|
Julia Radzhabova
|
7311cd0c8c
|
Refactoring open dialog
|
2021-03-23 16:55:20 +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 |
|
|
Maxim Kadushkin
|
b07a01bb0f
|
[all] hide "Dark theme" option from "View settings" menu
|
2021-02-21 21:40:41 +03:00 |
|
|
Julia Radzhabova
|
41a907f48d
|
[PE][PE mobile] Bug 46911
|
2021-02-16 17:05:47 +03:00 |
|
|
Julia Radzhabova
|
7bca00ebc5
|
Merge branch 'develop' into feature/pe-slide-size
|
2021-02-16 15:28:45 +03:00 |
|
|
Maxim Kadushkin
|
f34cb00e98
|
[dark theme] hide theme's option for IE
|
2021-02-16 15:08:39 +03:00 |
|
|
Julia Radzhabova
|
36856e2e20
|
[PE][PE mobile] Get/set slide size in emu
|
2021-02-15 20:10:46 +03:00 |
|
|
Maxim Kadushkin
|
436e232b2e
|
[all] refactoring
|
2021-02-14 00:44:12 +03:00 |
|
|
Maxim Kadushkin
|
db3a344760
|
[all] added "dark theme" item in button "Options"
|
2021-02-14 00:43:51 +03:00 |
|
|
Julia Radzhabova
|
fb8a6f1a98
|
Merge pull request #704 from ONLYOFFICE/feature/hide-rulers
Add hideRulers parameter to customization
|
2021-02-12 14:39:24 +03:00 |
|
|
Maxim Kadushkin
|
e641628a63
|
[all] refactoring
|
2021-02-12 12:08:53 +03:00 |
|
|
Julia Radzhabova
|
1de1fd9963
|
Add hideRulers parameter to customization
|
2021-02-11 20:13:47 +03:00 |
|
|
Julia Radzhabova
|
8dfd43ec0e
|
Change api parameter reviewGroups
|
2021-02-11 19:26:06 +03:00 |
|
|
Maxim Kadushkin
|
5b57ee760b
|
Merge branch 'develop' into feature/colors-table
# Conflicts:
# apps/common/main/resources/less/loadmask.less
# apps/documenteditor/main/app/controller/Main.js
# apps/documenteditor/main/app/view/FileMenuPanels.js
# apps/documenteditor/main/resources/less/toolbar.less
# apps/presentationeditor/main/app/controller/Main.js
# apps/presentationeditor/main/app/controller/RightMenu.js
# apps/presentationeditor/main/app/view/FileMenuPanels.js
# apps/presentationeditor/main/app/view/SlideSettings.js
# apps/spreadsheeteditor/main/app/controller/Main.js
# apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
# apps/spreadsheeteditor/main/resources/less/toolbar.less
|
2021-02-06 14:42:56 +03:00 |
|
|
Maxim Kadushkin
|
f938e668ef
|
[dark theme] added 'Themes' controller
|
2021-02-06 13:03:46 +03:00 |
|
|
Julia Radzhabova
|
f17b8d1c76
|
Change review permissions: deprecate customization.reviewPermissions parameter. Use permissions.reviewGroup instead: list of groups, that current user can accept/reject.
|
2021-02-05 13:51:37 +03:00 |
|
|
Julia Radzhabova
|
60cbd47725
|
Add new parameters to "permissions" section of config: editCommentAuthorOnly (can edit your own comments only if true), deleteCommentAuthorOnly (can delete your own comments only if true).
Deprecate customization.commentAuthorOnly parameter.
|
2021-02-04 12:39:56 +03:00 |
|
|
Julia Radzhabova
|
b72744ef47
|
FIx Bug 48553
|
2021-02-03 16:56:01 +03:00 |
|
|
Maxim Kadushkin
|
a24f5c0068
|
[PE] refactoring
|
2021-02-03 10:02:41 +03:00 |
|
|
Maxim Kadushkin
|
40a7e66834
|
[dark theme] keep theme name for next session
|
2021-02-02 15:37:00 +03:00 |
|
|
Julia Radzhabova
|
e83357f86a
|
[PE] Fix Bug 46920: add highlight button
|
2021-01-29 17:31:46 +03:00 |
|