Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
7151 commits 47 branches 5000 tags 623 MiB
Commit graph

559 commits

Author SHA1 Message Date
Julia Radzhabova c2e0ffb2be Merge branch 'release/v6.3.0' into develop 2021-04-15 11:18:07 +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 cfa07c5799 [SSE] Fix Bug 49500 2021-04-07 12:41:48 +03:00
Julia Radzhabova 77cd81322c Merge branch 'feature/sse-from-text' into develop 2021-04-05 11:34:54 +03:00
Julia Radzhabova fc2bcf24bd [PE][SSE] Add api parameters for co-authoring mode 2021-04-02 22:36:08 +03:00
Julia Radzhabova 630c01105c Merge branch 'release/v6.3.0' into develop 2021-04-02 17:33:33 +03:00
Julia Radzhabova 0a301cb9f7 [SSE] Fix Bug 49442 2021-04-02 16:45:04 +03:00
Julia Radzhabova 1e18f144c2 Merge branch 'fix/request-close' into develop 2021-03-30 15:34:56 +03:00
Julia Radzhabova 22fc77c0a4 Fix closing editors 2021-03-29 16:41:49 +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 3b901f91e4 Use sdk class 2021-03-26 14:29:16 +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 b5433c25db Merge branch 'develop' into feature/sse-conditional-formatting 2021-03-12 11:35:19 +03:00
Julia Radzhabova 5bde4a60be Merge branch 'feature/sse-pivot-groups' into release/v6.3.0 2021-03-10 00:11:29 +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 5fa63b39b3 [SSE] Add translation 2021-03-05 00:56:20 +03:00
Julia Radzhabova 7cfa187b70 [SSE] Add Asc.c_oAscError.ID.PivotGroup error 2021-03-04 23:20:12 +03:00
Julia Radzhabova b0fedaa13f Merge branch 'master' into release/v6.3.0 2021-03-04 13:51:02 +03:00
Julia Radzhabova 84e7d66330 [SSE] Change applying conditional format presets 2021-03-03 00:30:04 +03:00
Julia Radzhabova f6e15bda2a [SSE] Add presets for conditional formatting 2021-02-25 18:45:24 +03:00
Julia Radzhabova edefa48180 For Bug 48811 2021-02-19 13:16:19 +03:00
Maxim Kadushkin f34cb00e98 [dark theme] hide theme's option for IE 2021-02-16 15:08:39 +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
Maxim Kadushkin e641628a63 [all] refactoring 2021-02-12 12:08:53 +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
Maxim Kadushkin 40a7e66834 [dark theme] keep theme name for next session 2021-02-02 15:37:00 +03:00
Julia Radzhabova e6a7ab5dfb Fix updating guest user name 2021-01-20 23:49:01 +03:00
Julia Radzhabova 3e6090ca71 Remove warning when open protected files (saving files with password implemented for online files) 2021-01-20 19:32:42 +03:00
Julia Radzhabova e8eba05a54 Merge branch 'release/v6.2.0' into develop 2021-01-19 18:05:55 +03:00
Julia Radzhabova 0dd5a8a5de Merge branch 'hotfix/v6.1.1' into release/v6.2.0 2021-01-19 11:26:24 +03:00
Julia Radzhabova 28fb3ff98d [SSE] Fix diagram mode 2021-01-13 12:32:38 +03:00
Julia Radzhabova 64f81a2984 Merge branch 'feature/guest-name' into develop 2020-12-30 11:24:02 +03:00
Julia Radzhabova fc9530d919 Add customization parameter for setting anonymous name. 2020-12-29 23:48:47 +03:00
Julia Radzhabova 35b7ff277f [SSE] Fix Bug 48044 2020-12-23 16:47:13 +03:00
Julia Radzhabova 2784812084 Refactoring 2020-12-21 17:38:32 +03:00
Julia Radzhabova dbfcca5652 Disable favorite button for offline files 2020-12-21 14:07:00 +03:00
Julia Radzhabova 88eb04e0d3 Fix changing guest name 2020-12-20 12:22:46 +03:00
Maxim Kadushkin a60b6e4934 [SSE] repaired stylesheets 2020-12-19 22:45:36 +03:00