Commit graph

553 commits

Author SHA1 Message Date
Julia Radzhabova 79dbe85bdf Sort comments by date and author 2021-07-06 22:58:36 +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
Maxim Kadushkin a791ecdb85 [DE] added "Dark mode" option 2021-07-02 16:15:54 +03:00
Julia Radzhabova 6506146eab [DE] Fix disable for several actions 2021-06-30 15:19:45 +03:00
Julia Radzhabova 68fc002dc3 Refactoring 2021-06-30 00:31:55 +03:00
Julia Radzhabova 8e5979570b [DE] Refactoring disable editing 2021-06-29 16:27:44 +03:00
Maxim Kadushkin f63dab0827 [DE] fix skeleton theme colors 2021-06-28 17:26:13 +03:00
Maxim Kadushkin d484103500 [themes] load external themes 2021-06-25 11:55:33 +03:00
Maxim Kadushkin 4afe790e0f [themes] refactoring 2021-06-25 11:03:05 +03:00
Julia Radzhabova 7617a9681e [SSE] Protect workbook 2021-06-21 23:53:28 +03:00
Maxim Kadushkin f9a705efe0 [desktop] send theme type to native app 2021-06-16 20:11:55 +03:00
Maxim Kadushkin a360e037b5 [themes] debug 2021-05-28 15:12:22 +03:00
Maxim Kadushkin 4749a5ea15 [themes] refactoring 2021-05-25 17:16:00 +03:00
Maxim Kadushkin d14cc1e94f [themes] fix bug 50556 2021-05-24 19:17:24 +03:00
maxkadushkin a68c38f83c
Merge pull request #895 from ONLYOFFICE/feature/hotfix-6-3-1
Feature/hotfix 6 3 1
2021-05-23 21:36:43 +03:00
Maxim Kadushkin 67097751db [themes] fix method to set themes available 2021-05-23 20:04:26 +03:00
Julia Radzhabova 5dc775f830
Merge pull request #894 from ONLYOFFICE/fix/def-lang
Fix/def lang
2021-05-21 17:14:13 +03:00
Julia Radzhabova 45d7980212 Merge branch 'release/v6.3.0' into develop 2021-05-21 12:28:54 +03:00
Maxim Kadushkin a166cf858c [themes] debug themes toggle 2021-05-19 12:33:03 +03:00
Julia Radzhabova f7ad092d81 Change comment groups: show comment replys from all users group if comment is visible for current user group 2021-05-18 15:18:58 +03:00
Maxim Kadushkin 2d4e237e75 [themes] correct "available" option 2021-05-15 13:47:32 +03:00
Maxim Kadushkin 668dfb5680 [desktop] added option to hide themes selector 2021-05-15 00:07:13 +03:00
Maxim Kadushkin 1e175f338a [all] fix bug 50414 2021-05-14 15:32:03 +03:00
Julia Radzhabova 59c658ecab Wopi: change config parameters and post messages 2021-05-13 00:57:01 +03:00
Julia Radzhabova f8ee00314a Change file sharing by url for wopi 2021-05-12 22:27:57 +03:00
Maxim Kadushkin 5f1a5c7fb2 [themes] debug 2021-05-12 17:20:01 +03:00
Maxim Kadushkin f900a3480b [all] extend options on desktop app launch 2021-05-12 16:41:59 +03:00
Julia Radzhabova e8d4de37e6 Add parameter for default interface language 2021-05-12 01:33:51 +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
maxkadushkin bcbaedf762
Update Themes.js 2021-04-26 13:36:18 +03:00
Maxim Kadushkin 66dba701d8 [themes] refactoring 2021-04-26 10:53:52 +03:00
Julia Radzhabova 6c7a22d39a
Merge pull request #838 from ONLYOFFICE/fix/bugfix
Fix/bugfix
2021-04-25 00:16:48 +03:00
Julia Radzhabova 1449b92acc Fix plugins 2021-04-24 23:39:27 +03:00
Maxim Kadushkin 9795ebde57 [theme] added new theme's values 2021-04-24 23:20:55 +03:00
Maxim Kadushkin 386bf60f37 [themes] debug themes 2021-04-24 19:42:14 +03:00
Julia Radzhabova bc6653ef7f [DE] Fix Bug 49928 2021-04-24 01:30:36 +03:00
maxkadushkin a0f7048e16
Update Themes.js 2021-04-23 15:39:46 +03:00
maxkadushkin 1d989777a7
[themes] fix bug 49875 2021-04-23 00:25:31 +03:00
Maxim Kadushkin 493ad0ac9e [themes] changed theme's current value 2021-04-22 19:49:37 +03:00
Maxim Kadushkin 7d8787b46f [themes] added options to load single theme 2021-04-22 12:47:36 +03:00
Maxim Kadushkin 57c9c6268e [common] extended theme's object 2021-04-18 17:32:39 +03:00
Maxim Kadushkin 0cec65caae [themes] added new theme 2021-04-17 16:10:35 +03:00
Maxim Kadushkin 4d5880486d [common] refactoring 2021-04-17 16:08:04 +03:00
Julia Radzhabova d6ffb6006b Change isModal parameter for plugins config: show modal/non-modal dialog 2021-04-16 15:59:52 +03:00
Julia Radzhabova eb0a5023b2 [DE] Convert text to table 2021-04-16 00:32:56 +03:00
Julia Radzhabova c2e0ffb2be Merge branch 'release/v6.3.0' into develop 2021-04-15 11:18:07 +03:00
Julia Radzhabova 2c09b041f3 Fix plugins icons: support old versions 2021-04-08 11:32:39 +03:00
Julia Radzhabova 3b146397ee
Merge pull request #796 from ONLYOFFICE/feature/resolve-comments
Feature/resolve comments
2021-04-07 23:06:35 +03:00
Julia Radzhabova 9a8db1b3b8 Disable resolve button 2021-04-07 22:50:53 +03:00
Julia Radzhabova 0ec5ce92b8
Merge pull request #793 from ONLYOFFICE/fix/plugin-version
Fix/plugin version
2021-04-06 21:28:58 +03:00
Julia Radzhabova 49eba78cbc Set plugin version 2021-04-06 21:25:24 +03:00
maxkadushkin 0e9b1fa822
Update Themes.js 2021-04-06 20:06:14 +03:00
Julia Radzhabova 762b3322b8 Check plugins version 2021-04-06 19:52:13 +03:00
Maxim Kadushkin 2c0696ed12 Merge branch 'release/v6.3.0' into develop 2021-04-06 14:44:41 +03:00
Julia Radzhabova 33acee7d61 Resolve all comments 2021-04-06 10:53:53 +03:00
Maxim Kadushkin ae201c5b0b [common] send theme's colors array to sdk 2021-04-06 10:31:32 +03:00
Julia Radzhabova 630c01105c Merge branch 'release/v6.3.0' into develop 2021-04-02 17:33:33 +03:00
Maxim Kadushkin bca6099e18 [common] skip theme's colors updatre for IE 2021-04-02 12:22:17 +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
Maxim Kadushkin 4bcdf7d071 [dark theme] fix bug 49276 2021-04-02 00:02:47 +03:00
Julia Radzhabova 273b4ff6c7 [Plugins] Add support for active button 2021-03-30 10:20:00 +03:00
Julia Radzhabova fea0125822 [Plugins] Add support for new icons config 2021-03-30 01:44:42 +03:00
Julia Radzhabova b1d3ba3fc0 Merge branch 'release/v6.3.0' into develop 2021-03-29 16:33:45 +03:00
Julia Radzhabova 78229a2bab Merge branch 'develop' into feature/comment-permissions 2021-03-28 22:18:19 +03:00
Julia Radzhabova 0b2a3aec7e Add event onPluginsReady 2021-03-26 20:37:29 +03:00
Julia Radzhabova 3b901f91e4 Use sdk class 2021-03-26 14:29:16 +03:00
Julia Radzhabova 69375d0c00 [PE] Fix Bug 49233 2021-03-23 18:41:11 +03:00
Julia Radzhabova 8a3a74dc2d Use config permssions to view comments 2021-03-17 20:08:47 +03:00
Julia Radzhabova f35e929713 Add permissions for edit/remove comments 2021-03-17 12:02:06 +03:00
Julia Radzhabova 7cc14b5f26 Refactoring review permissions 2021-03-16 13:46:44 +03:00
Maxim Kadushkin f8920bd84a [common] refactoring 2021-03-14 00:20:01 +03:00
Maxim Kadushkin ecc19e0c62 [all] fix bug 49030 2021-03-12 00:16:19 +03:00
Julia Radzhabova ef9f6048c6 Fix Bug 49007 2021-03-09 14:48:36 +03:00
Julia Radzhabova 2fb370418f [DE] Refactoring 2021-03-01 18:07:12 +03:00
Julia Radzhabova c3b0f9c2b6 [DE] Fix new track changes 2021-02-27 12:43:32 +03:00
Julia Radzhabova 526732cc53 [DE] Change track revisions 2021-02-26 15:11:57 +03:00
Maxim Kadushkin 203496dca5 [desktop] added 'themes' feature for editor 2021-02-25 23:56:18 +03:00
Maxim Kadushkin 683a87fbe5 [dark theme] changes for desktop app 2021-02-24 23:34:05 +03:00
Julia Radzhabova 7014d076a4 Merge branch 'feature/new-track-changes' into develop 2021-02-19 20:35:56 +03:00
Maxim Kadushkin 1fed5dc207 [dark theme] correct some components 2021-02-18 00:27:58 +03:00
Maxim Kadushkin 842609d80c [dark theme] stylesheets didn't apply on next app start 2021-02-18 00:25:27 +03:00
Maxim Kadushkin 7b7d037176 [dark theme] fixed themes switching 2021-02-17 18:58:24 +03:00
Maxim Kadushkin f34cb00e98 [dark theme] hide theme's option for IE 2021-02-16 15:08:39 +03:00
Maxim Kadushkin db3a344760 [all] added "dark theme" item in button "Options" 2021-02-14 00:43:51 +03:00
Julia Radzhabova 7e822933ca Hide track changes tip on timeout 2021-02-10 13:40:53 +03:00
Julia Radzhabova 4b232db539 [DE] Save track changes to file: set 4 variants of track changes mode 2021-02-10 13:09:21 +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
Maxim Kadushkin c879fa6c80 [dark theme] changed storage key name 2021-02-06 12:55:47 +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
Maxim Kadushkin 40a7e66834 [dark theme] keep theme name for next session 2021-02-02 15:37:00 +03:00
Julia Radzhabova e8eba05a54 Merge branch 'release/v6.2.0' into develop 2021-01-19 18:05:55 +03:00
Julia Radzhabova 64f81a2984 Merge branch 'feature/guest-name' into develop 2020-12-30 11:24:02 +03:00
Julia Radzhabova 014e07fe03 Fix layout for plugins tab 2020-12-22 14:39:26 +03:00
Julia Radzhabova e8dcb54c78 Fix changing user name 2020-12-18 13:23:14 +03:00
Julia Radzhabova c1a04680c1 Fix selecting revision 2020-12-10 19:00:33 +03:00
Julia Radzhabova 583065a6af [DE] Change name for guest user 2020-12-10 14:48:03 +03:00
Julia Radzhabova a33474c67b Load autostart plugins from config (when plugins are loaded from server) 2020-11-20 15:27:06 +03:00
Julia Radzhabova d57f57692f Merge branch 'release/v6.1.0' into develop 2020-11-19 23:36:48 +03:00
Julia Radzhabova 525a0a4aec Fix Bug 47533 2020-11-18 15:28:47 +03:00
Julia Radzhabova 7b52161726 [DE][DE mobile] Add api parameter customization.trackChanges: on/off track changes mode in document editor 2020-11-02 14:16:52 +03:00
Julia Radzhabova 460ff7e6f3 Merge branch 'feature/de-new-controls' into develop 2020-10-31 19:11:19 +03:00
Maxim Kadushkin 29520613f9 [desktop] fixed wrong action click 2020-10-28 22:59:24 +03:00
Julia Radzhabova a8325910b7 [DE] Use OptionsDialog 2020-10-15 15:37:48 +03:00
Julia Radzhabova 0a9d8773cd [DE] Turn on/off fill form mode from Forms tab 2020-10-08 11:11:34 +03:00
Julia Radzhabova 92c97dc1aa Change config parameter documentType: it must take one of the values word/cell/slide (deprecate text/spreadsheet/presentation values). 2020-09-11 16:34:29 +03:00
Maxim Kadushkin aa0242e16d [desktop] cut unused code 2020-09-04 20:23:57 +03:00
Julia Radzhabova b7f410def8 Changes for reviewPermissions: support for "" - empty group.
Used for users without groups.
2020-09-02 21:03:09 +03:00
Julia Radzhabova 47692237c4 Add userdata field to comments 2020-08-31 14:27:54 +03:00
Julia Radzhabova e222fdf4a7 Add parameter to api config: customization.reviewPermissions (user name must be prefixed) 2020-08-04 22:20:20 +03:00
Julia Radzhabova e0be508225 Merge branch 'hotfix/v5.6.0' into develop 2020-07-28 22:15:23 +03:00
Julia Radzhabova e79fa7f093 [Plugins] Move help parameter to variations 2020-07-21 18:23:39 +03:00
Julia Radzhabova 70a4ff2b87 Show help for plugins 2020-07-21 15:33:22 +03:00
Maxim Kadushkin e1a707e49c [desktop] 'isCrypted' sent to desktop app 2020-06-09 00:22:12 +03:00
Julia Radzhabova 0d3ba4831f Refactoring 2020-06-05 20:34:50 +03:00
Julia Radzhabova ef5fe977da
Merge pull request #408 from ONLYOFFICE/feature/macros-settings
Feature/macros settings
2020-06-03 16:55:13 +03:00
Maxim Kadushkin b1233935d8 [desktop] changed 'desktop' controller 2020-05-22 18:02:54 +03:00
Julia Radzhabova 10d596be29 [DE] Add api parameter customization.plugins: hide plugins panel when false 2020-05-21 23:07:41 +03:00
Maxim Kadushkin f50d0253ca [all] debug locked file open 2020-04-29 20:54:48 +03:00
Maxim Kadushkin 90128ec48c [desktop] fix bug 45170 2020-04-27 19:38:55 +03:00
Maxim Kadushkin 37094765cb [desktop] debug for locked file 2020-04-24 12:00:28 +03:00
Maxim Kadushkin c462bd6ddb [desktop] fix bug 45005 2020-04-21 17:03:04 +03:00
Maxim Kadushkin 7bd2011e08 [desktop] fix bug 45170 2020-04-21 11:20:15 +03:00
Maxim Kadushkin c7902ef927 [desktop] fix bug 45095 2020-04-09 18:21:51 +03:00
Maxim Kadushkin bc5552711d [desktop] send editor's config as soon as ready 2020-04-09 18:21:51 +03:00
maxkadushkin 583d745b84
Update Desktop.js (#374) 2020-04-03 16:26:40 +03:00
maxkadushkin 3268acdfcf
fix bug 45012 (#372) 2020-04-02 17:17:35 +03:00
Maxim Kadushkin 46bd7b76a5 [desktop] hide modal window's mask 2020-03-17 18:06:09 +03:00
Maxim Kadushkin 586d26619f [desktop] fix bug 42729 2020-03-15 18:13:29 +03:00
Maxim Kadushkin aa984412b2 fix bug 44815 2020-03-13 17:46:10 +03:00
Maxim Kadushkin 8c5cf7e9f9 [desktop] refactoring 2020-03-05 13:09:53 +03:00
maxkadushkin 650b0c0f82
Update Desktop.js (#352) 2020-02-26 16:14:04 +03:00
maxkadushkin ca46cf41b0
Update Desktop.js (#349) 2020-02-25 18:23:38 +03:00
Julia Radzhabova d041247d7b
[DE][DE mobile] Fix bugs in review changes (#339) 2020-02-14 17:39:13 +03:00
maxkadushkin 7ff056f7d5
Update Desktop.js (#334) 2020-02-07 16:15:41 +03:00
Julia Radzhabova eb9da5251b Add parameter customization->mentionShare: change hint for mention in comment 2019-12-23 15:51:00 +03:00
Julia Radzhabova 36b19cf3d0 [Mentions] Check onRequestSendNotify event when send notification (don't check onRequestUsers event) 2019-12-20 17:40:15 +03:00
Maxim Kadushkin e5a0e50eda Merge with develop 2019-12-04 15:26:53 +03:00
Julia Radzhabova f9ac080ba0 Merge branch 'hotfix/v5.4.2' into develop 2019-11-29 16:01:17 +03:00
Julia Radzhabova 019dffbceb Add event onRequestSharingSettings: use instead editorConfig.sharingSettingsUrl. 2019-11-28 16:54:14 +03:00
Julia Radzhabova 8027645de5 Merge branch 'develop' into feature/compare 2019-11-28 12:51:56 +03:00
Julia Radzhabova b811606de9 Merge branch 'develop' into feature/remove-comments 2019-11-15 11:52:22 +03:00
Julia Radzhabova 9d8675f041 [DE] Disable comparing of documents in the co-editing mode 2019-11-14 13:25:01 +03:00
Julia Radzhabova 769fa9a611 Merge branch 'develop' into feature/compare 2019-11-14 12:47:19 +03:00
Julia Radzhabova 56042f4c89 [SSE] Fix appearance of comment popover in view mode 2019-11-13 14:47:32 +03:00
Julia Radzhabova 0dd9e23188 Merge branch 'develop' into feature/remove-comments 2019-11-13 14:32:00 +03:00
Julia Radzhabova 9f4c98cedf [DE] Fix bug in version history (wrong history data parameters) 2019-11-13 13:51:32 +03:00
Maxim Kadushkin 7141304b4e [desktop] keep early requests for 'desktop' plugin 2019-11-06 16:55:02 +03:00
Julia Radzhabova 3308662a1d [DE] Fix Bug 43460 (#261) 2019-11-06 11:07:56 +03:00