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

1584 commits

Author SHA1 Message Date
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 9002d44a7f
Merge pull request #1067 from ONLYOFFICE/feature/sse-protection 
Feature/sse protection
 2021-08-12 15:59:32 +03:00
Julia Radzhabova eb93f3562a [SSE] Fix getting protection options 2021-08-12 01:42:14 +03:00
Julia Radzhabova c1a400019c [SSE] Clear format for unlocked cells 2021-08-11 18:42:03 +03:00
Julia Radzhabova dea0fb93d5 [SSE] Change check sorted range 2021-08-11 00:24:12 +03:00
JuliaSvinareva 286876fe3d [SSE] Change statusbar, set compact by default, add status block in compact statusbar, add opportunity to hide this block by context menu 2021-08-10 18:34:00 +03:00
Julia Radzhabova aad4885398 [SSE] Fix clear format on protected sheet 2021-08-10 17:49:40 +03:00
Julia Radzhabova 7dcbc69f1b Fix sending filetype 2021-08-09 19:09:59 +03:00
Julia Radzhabova 425b105e8e [SSE] For Bug 51811 2021-08-09 13:39:58 +03:00
Julia Radzhabova 3ab6e18621 Merge branch 'release/v6.4.0' into develop 2021-08-09 13:30:40 +03:00
Julia Radzhabova cda49d94f8 [SSE] Disable name manager on protected sheet. 
Disable adding comments when objects are protected
 2021-08-09 01:00:41 +03:00
Julia Radzhabova 85882cf113 [SSE] Fix hyperlinks editing. Add errors 2021-08-08 23:10:52 +03:00
Julia Radzhabova 4fecc63ba0 [SSE] Fix protect sheet 2021-08-05 19:09:21 +03:00
Julia Radzhabova d769334e38 Refactoring 2021-08-05 19:04:14 +03:00
Julia Radzhabova c9b181ea3f Fix editing on protected sheet 2021-08-05 18:53:04 +03:00
Julia Radzhabova 8cbdfcedfb Merge branch 'develop' into feature/sse-protection 2021-08-05 13:49:29 +03:00
Julia Radzhabova 6a270a5e03 [SSE] Protect sheet from context menu 2021-08-05 00:37:48 +03:00
Julia Radzhabova 1603e3cf9b [SSE] Set hidden formulas 2021-08-04 22:32:07 +03:00
Julia Radzhabova a256c9413b [SSE] Set shape/text protect settings 2021-08-04 20:54:21 +03:00
Julia Radzhabova be3714bf98
Merge pull request #1034 from ONLYOFFICE/feature/sse-foreign-cursor 
Feature/sse foreign cursor
 2021-07-30 17:54:18 +03:00
Julia Radzhabova dc084a1d0a [SSE] Fix foreign cursor position 2021-07-30 17:41:35 +03:00
Julia Radzhabova f469783c38 [SSE] Show user color for selected cell 2021-07-30 16:14:30 +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 fb5612e265 [SSE] For Bug 51484 2021-07-29 15:12:38 +03:00
Julia Radzhabova 108ed183d5 [SSE] Show name for foreign user 2021-07-28 22:13:08 +03:00
JuliaSvinareva 3f0cc17039 [SSE] Made changing of status items in statusbar 2021-07-28 19:49:34 +03:00
Julia Radzhabova 511c31886c [SSE] Fix version restore 2021-07-28 00:06:52 +03:00
Julia Radzhabova d767fa5399 Merge branch 'release/v6.4.0' into develop 2021-07-28 00:03:49 +03:00
Julia Radzhabova f947224a95 Merge branch 'feature/sse-version-history' into develop 2021-07-27 21:20:33 +03:00
JuliaSvinareva eda6510de0 [SSE] Add methods and styles to change compact mode of statusbar 2021-07-26 16:57:01 +03:00
JuliaSvinareva e5676c4c7c [SSE] Remove unused code 2021-07-26 16:54:28 +03:00
Julia Radzhabova f305e57396 Fix Bug 51487 2021-07-23 17:40:21 +03:00
Julia Radzhabova f13673653f Merge branch 'release/v6.4.0' into develop 2021-07-22 17:44:51 +03:00
Julia Radzhabova 009779620d Bug 44511 2021-07-22 12:40:13 +03:00
Julia Radzhabova 48c200d641 [SSE] Fix Bug 51418 2021-07-20 18:43:04 +03:00
Julia Radzhabova a53b3dfdcb [SSE] For bug 51398 2021-07-20 16:24:05 +03:00
Julia Radzhabova de3786afae [SSE] Check clear cell on protected sheet 2021-07-20 13:03:44 +03:00
JuliaSvinareva f217483d9d [SSE] Add second line in statusbar, add hide statusbar button in options 2021-07-20 12:30:09 +03:00
Julia Radzhabova 0d666fe210 [SSE] Check insert on protected sheet 2021-07-20 00:02:30 +03:00
Julia Radzhabova 992b831a79 [SSE] Check insert hyperlink on protected sheet 2021-07-19 23:50:45 +03:00
Julia Radzhabova 3c09b6d325 [SSE] Lock allow ranges button 2021-07-19 23:49:51 +03:00
Julia Radzhabova b4c0fd398f Fix right panel settings 2021-07-19 20:52:32 +03:00
Julia Radzhabova c18ed375ca [SSE] Disable right panel on protected sheet 2021-07-19 20:48:36 +03:00
Julia Radzhabova 1199804ae6 [SSE] Protect objects 2021-07-19 16:56:46 +03:00
Julia Radzhabova bad734231e [SSE] Disable context menu for protected sheet 2021-07-19 16:43:58 +03:00
Julia Radzhabova 656715a52b Merge branch 'release/v6.4.0' into develop 2021-07-19 14:37:16 +03:00
Julia Radzhabova 16557cd2f8 [SSE] Disable context menu on protected sheet 2021-07-18 02:11:58 +03:00
Julia Radzhabova 0266091311 Fix disabled buttons 2021-07-18 01:09:26 +03:00
Julia Radzhabova ef2af067b0 [SSE] Protect row/columns insert/delete 2021-07-18 00:22:55 +03:00
Julia Radzhabova b3f4bf0cf8 Merge branch 'feature/bug-50956' into develop 2021-07-17 18:04:41 +03:00
Julia Radzhabova 230b553b26 [SSE] Fix Bug 50956 2021-07-17 17:42:57 +03:00
Julia Radzhabova 6aeda263a8 [SSE] Protect refactoring, lock hyperlink insert 2021-07-17 01:31:56 +03:00
Julia Radzhabova 304af6ae6e [SSE] Sheet protection 2021-07-17 00:49:36 +03:00
JuliaSvinareva c4e3899ebd
Merge branch 'develop' into feature/alt-keys 2021-07-16 17:45:18 +03:00
Julia Radzhabova 2e9391d907 [SSE] Lock format editing on protected sheet 2021-07-16 15:47:24 +03:00
JuliaSvinareva a6134b58a1 Fix hint manager 2021-07-15 17:20:58 +03:00
Julia Radzhabova 54a3676902 [SSE] For Bug 50956 2021-07-14 23:31:40 +03:00
JuliaSvinareva 3a65ac540f Hint manager: fix locking key events, fix click/mousedown handling 2021-07-12 19:33:05 +03:00
Julia Radzhabova 1a055fcbcc Refactoring Common.UI.ButtonColored 2021-07-11 02:25:12 +03:00
JuliaSvinareva 8bf91f4847 Fix hint manager, add hint visible checks to close panels in left menu 2021-07-08 20:20:34 +03:00
Julia Radzhabova 91c9872ffc Add close comments button. Layout refactoring 2021-07-07 01:51:19 +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
Julia Radzhabova 05c9b13687
Merge pull request #960 from ONLYOFFICE/feature/disable-editing 
Feature/disable editing
 2021-07-02 17:08:21 +03:00
Julia Radzhabova f910c046b8 [SSE] Refactoring disable editing 2021-07-02 00:54:55 +03:00
JuliaSvinareva a443fcfd2a Merge branch 'develop' into feature/alt-keys 2021-07-01 16:47:01 +03:00
JuliaSvinareva a041dddc7b Merge branch 'feature/Bug_46767' into develop 2021-07-01 15:53:41 +03:00
JuliaSvinareva d8a24b96c0 [SSE] Bug 46767 2021-07-01 13:34:48 +03:00
Julia Radzhabova 52d179153b Always use user info parser 2021-06-30 21:04:25 +03:00
JuliaSvinareva dc5268069e [SSE] Bug 46767 (fix locked, fix close after click on item) 2021-06-30 15:36:53 +03:00
Julia Radzhabova 85271a0e0a [SSE] Refactoring disabled panels 2021-06-29 16:10:29 +03:00
Julia Radzhabova 3f429b0bc8 [SSE] Add version history 2021-06-28 20:18:53 +03:00
Julia Radzhabova 8e3bc0869a [SSE] Refactoring disabled panels 2021-06-28 20:12:31 +03:00
Julia Radzhabova cacadc927f [SSE] Bugfix 2021-06-28 16:06:32 +03:00
Julia Radzhabova 246295386b [SSE] Show user's cursor on co-editing 2021-06-28 14:51:32 +03:00
JuliaSvinareva 7719d51d28 [SSE] Fix bug 46767 2021-06-26 16:16:33 +03:00
Julia Radzhabova be22bc97a5 [SSE] Disable workbook actions when workbook is protected 2021-06-25 18:29:17 +03:00
Julia Radzhabova 56200c7987 [SSE] Fix protected ranges 2021-06-24 01:01:25 +03:00
Julia Radzhabova acb4d52781 [SSE] Edit protected range 2021-06-23 18:49:47 +03:00
Julia Radzhabova 2e6bff5c0e [SSE] Show protected ranges 2021-06-23 00:46:43 +03:00
Julia Radzhabova fb57f2d0e2 [SSE] Add error on a protected sheet 2021-06-22 16:15:15 +03:00
Julia Radzhabova 65498d9582 [SSE] Change existing protection props 2021-06-22 16:07:10 +03:00
Julia Radzhabova 4789fd68f0 Fix Bug 27605 2021-06-22 15:42:21 +03:00
Julia Radzhabova dad7205a5e [SSE] Show protected sheet 2021-06-22 15:04:10 +03:00
Julia Radzhabova bb9877ccca [SSE] Protect sheet 2021-06-22 14:56:07 +03:00
Julia Radzhabova 8bb87afdee [SSE] Use sdk protect functions 2021-06-22 12:16:38 +03:00
Julia Radzhabova 05099e883c [SSE] Protect workbook 2021-06-22 00:43:55 +03:00
Julia Radzhabova 72378721fd [SSE] Unprotect workbook 2021-06-22 00:23:45 +03:00
Julia Radzhabova 7617a9681e [SSE] Protect workbook 2021-06-21 23:53:28 +03:00
Julia Radzhabova 11c999227d [SSE] Add sheet/workbook protection buttons 2021-06-21 18:00:20 +03:00
Julia Radzhabova 41d95920a7 Fix loading mask on document opening 2021-06-18 16:53:50 +03:00
Julia Radzhabova b713a7fe09 [SSE] Fix Bug 50788 2021-06-18 13:50:43 +03:00
JuliaSvinareva 529d6c2ad0 [SSE] Hint manager: add hints into right menu and file menu 2021-06-10 23:05:49 +03:00
maxkadushkin 15df027586
[SSE] lock 'protect' buttons while cell editing (#921) 2021-06-10 18:43:36 +03:00
JuliaSvinareva f120ccf6be [SSE] Hint Manager: add hints into toolbar 2021-06-07 21:00:13 +03:00
Julia Radzhabova 2dbe9ef2dc [SSE] Add offset for formula menu 2021-05-28 14:26:54 +03:00
Julia Radzhabova 805452abc9 [SSE][SSE mobile] Add ConfirmReplaceFormulaInTable error 2021-05-27 16:59:39 +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 10dc794e84 Merge sse-zeros feature into develop 2021-05-24 12:48:52 +03:00
Julia Radzhabova 033f78275f
Merge pull request #896 from ONLYOFFICE/feature/freeze-panes 
[SSE] Add presets for freeze panes
 2021-05-24 11:33:04 +03:00
Julia Radzhabova 9ad620c727 [SSE] Remove autocorrect option 2021-05-21 20:48:40 +03:00
Julia Radzhabova a095cc56f4 [SSE] Add presets for freeze panes 2021-05-21 19:12:54 +03:00
Julia Radzhabova f1f613451c [SSE] Add show zero option 2021-05-21 18:01:49 +03:00
Julia Radzhabova 45d7980212 Merge branch 'release/v6.3.0' into develop 2021-05-21 12:28:54 +03:00
Julia Radzhabova 20d4568346 [SSE] Add autocorrect settings for hyperlinks 2021-05-20 18:37:42 +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 be4a444adb Fix Bug 50298 2021-05-11 15:24:53 +03:00
Julia Radzhabova acc4cca3a0 [SSE] Fix changing char type 2021-05-06 16:43:46 +03:00
Julia Radzhabova c14408bd9c Fix wopi messages 2021-05-06 14:37:46 +03:00
Julia Radzhabova c8e5f8e086 [SSE] Fix changing chart type 2021-05-04 12:24:14 +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 ef801c5994 [SSE] Add translations 2021-04-29 20:12:12 +03:00
Maxim Kadushkin acaeec776f [SSE] fix bug 50024 2021-04-27 20:21:45 +03:00
Julia Radzhabova e6b8a379ba Fix vulnerability 2021-04-26 14:54:55 +03:00
Julia Radzhabova 67499c5d21 Fix Bug 34613, Fix Bug 16000 2021-04-20 18:46:41 +03:00
Julia Radzhabova f80a1f7652 [SSE] Assign macro to shape 2021-04-16 23:29:20 +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 cfa07c5799 [SSE] Fix Bug 49500 2021-04-07 12:41:48 +03:00
Julia Radzhabova 300f9bc575 [SSE] Fix preview bullets 2021-04-06 22:57:14 +03:00
Julia Radzhabova 77cd81322c Merge branch 'feature/sse-from-text' into develop 2021-04-05 11:34:54 +03:00
Julia Radzhabova dd1817c6e7 [SSE] Draw list preview in sdk 2021-04-03 10:53:38 +03:00
Julia Radzhabova 926a3c436d [SSE] Draw list preview in sdk 2021-04-03 10:44:20 +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 1e632df252
Merge pull request #776 from ONLYOFFICE/feature/sse-sparkline 
Feature/sse sparkline
 2021-04-01 13:45:46 +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 b80686c318 [SSE] Mousemove fix 2021-03-28 00:42:42 +03:00
Julia Radzhabova 0b3d221b5b Fix Bug 49256 2021-03-26 23:46:57 +03:00
Julia Radzhabova 3b901f91e4 Use sdk class 2021-03-26 14:29:16 +03:00
Julia Radzhabova 35237831f5 [SSE] Fix ranges for sparklines 2021-03-24 18:39:00 +03:00
Julia Radzhabova 9b56b8b253 [SSE] Fix Bug 49232 2021-03-23 18:16:31 +03:00
Julia Radzhabova 8489136021 [SSE] Add sparkline 2021-03-23 17:51:50 +03:00
Julia Radzhabova 7311cd0c8c Refactoring open dialog 2021-03-23 16:55:20 +03:00
Julia Radzhabova 1f62dbf053 [SSE] Refactoring data from file 2021-03-23 11:43:12 +03:00
Julia Radzhabova 5ab470ec5f [SSE] Add sparklines 2021-03-22 22:21:03 +03:00
Julia Radzhabova d1ff42ccd8 [SSE] Add translation 2021-03-22 17:18:32 +03:00
Julia Radzhabova 89d44c31fe [SSE] Set encoding for data from file 2021-03-22 16:45:42 +03:00
Julia Radzhabova b5438c6648 [SSE] Import data from text/csv file 2021-03-19 17:00:05 +03:00
Julia Radzhabova f35e929713 Add permissions for edit/remove comments 2021-03-17 12:02:06 +03:00
Julia Radzhabova 5609945406 [SSE] Add conditional formatting from right panel 2021-03-15 23:10:47 +03:00
Julia Radzhabova 06291bb30d [SSE] Change rules in the toolbar 2021-03-15 18:31:39 +03:00
Julia Radzhabova 35cab5fe73 [SSE] Change rules in the toolbar 2021-03-15 17:44:09 +03:00
Julia Radzhabova afdb5b343f [SSE] Fix rules lock 2021-03-12 12:41:05 +03:00
Julia Radzhabova b5433c25db Merge branch 'develop' into feature/sse-conditional-formatting 2021-03-12 11:35:19 +03:00
Julia Radzhabova eecb45cb52 [SSE] Add conditional formatting from context menu 2021-03-11 23:11:07 +03:00
Julia Radzhabova 1b6dadb801 [SSE] Add rules from toolbar 2021-03-10 12:14:44 +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 3a0c941d73 [SSE] Fix pivot groups 2021-03-09 14:43:05 +03:00
Julia Radzhabova 9d18c8ce13 [SSE] Apply auto values for pivot groups 2021-03-05 11:49:58 +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 274f56291a [SSE] Group/ungroup pivot table 2021-03-04 23:15:29 +03:00
Julia Radzhabova b0fedaa13f Merge branch 'master' into release/v6.3.0 2021-03-04 13:51:02 +03:00
Julia Radzhabova 0f1288e198 [SSE] Fix icons sets presets 2021-03-03 14:05:31 +03:00
Julia Radzhabova 84e7d66330 [SSE] Change applying conditional format presets 2021-03-03 00:30:04 +03:00
Julia Radzhabova 6c7ebc300a Update icons 2021-02-26 16:36:24 +03:00
Julia Radzhabova 8e282825f1 [SSE] Add icon sets presets 2021-02-25 23:15:05 +03:00
Julia Radzhabova f6e15bda2a [SSE] Add presets for conditional formatting 2021-02-25 18:45:24 +03:00
Julia Radzhabova 40a35856b5 [SSE] Fix rule settings 2021-02-24 18:49:05 +03:00
Julia Radzhabova bf7b439134 [SSE] For Bug 48857 2021-02-24 16:50:28 +03:00
Maxim Kadushkin b07a01bb0f [all] hide "Dark theme" option from "View settings" menu 2021-02-21 21:40:41 +03:00
Julia Radzhabova 0075983c9f Merge branch 'develop' into feature/sse-conditional-formatting 2021-02-20 19:15:44 +03:00
Julia Radzhabova b4e8567481 Charts refactoring 2021-02-20 16:54:09 +03:00
Julia Radzhabova edefa48180 For Bug 48811 2021-02-19 13:16:19 +03:00
Julia Radzhabova e543142c26 Fix scroll in combobox, listview. 2021-02-18 20:38:46 +03:00
Maxim Kadushkin f34cb00e98 [dark theme] hide theme's option for IE 2021-02-16 15:08:39 +03:00
Julia Radzhabova 2a0da2b625 [SSE] Bug 48708 2021-02-16 14:49:13 +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 f62aa45b18 Merge branch 'develop' into feature/multiZoom5.5 
# Conflicts:
#	apps/common/main/resources/img/toolbar/1x/big/.css.handlebars
#	apps/common/main/resources/less/asc-mixins.less
#	apps/common/main/resources/less/buttons.less
#	apps/common/main/resources/less/checkbox.less
#	apps/common/main/resources/less/combo-dataview.less
#	apps/common/main/resources/less/comments.less
#	apps/common/main/resources/less/common.less
#	apps/common/main/resources/less/dataview.less
#	apps/common/main/resources/less/dropdown-menu.less
#	apps/common/main/resources/less/listview.less
#	apps/common/main/resources/less/multislider-gradient.less
#	apps/common/main/resources/less/radiobox.less
#	apps/common/main/resources/less/scroller.less
#	apps/common/main/resources/less/separator.less
#	apps/common/main/resources/less/theme-colorpalette.less
#	apps/common/main/resources/less/toolbar.less
#	apps/common/main/resources/less/window.less
#	apps/documenteditor/main/resources/less/advanced-settings.less
#	apps/documenteditor/main/resources/less/filemenu.less
#	apps/documenteditor/main/resources/less/leftmenu.less
#	apps/documenteditor/main/resources/less/rightmenu.less
#	apps/documenteditor/main/resources/less/statusbar.less
#	apps/documenteditor/main/resources/less/toolbar.less
#	apps/presentationeditor/main/resources/less/leftmenu.less
#	apps/presentationeditor/main/resources/less/rightmenu.less
#	apps/presentationeditor/main/resources/less/statusbar.less
#	apps/spreadsheeteditor/main/resources/less/celleditor.less
#	apps/spreadsheeteditor/main/resources/less/leftmenu.less
#	apps/spreadsheeteditor/main/resources/less/rightmenu.less
#	apps/spreadsheeteditor/main/resources/less/statusbar.less
#	apps/spreadsheeteditor/main/resources/less/toolbar.less
 2021-02-10 15:40:30 +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 30ebb561e6 [SSE] Add/remove rules 2021-01-28 18:21:07 +03:00
Julia Radzhabova b2dd7d02d6
Merge pull request #682 from ONLYOFFICE/release/v6.2.0 
Release/v6.2.0
 2021-01-28 12:07:00 +03:00
Julia Radzhabova e8359bea7a Refactoring 2021-01-26 19:41:51 +03:00
Julia Radzhabova 729b8a8b10 [SSE] Apply settings for conditional formatting 2021-01-26 11:38:05 +03:00
Julia Radzhabova 6014823eb3 [SSE] Fix font name. 
Fix for rev. ab48174165 [ab48174]
11 ноября 2020 г. 15:32:19
Improve performance
 2021-01-23 16:40:40 +03:00
Julia Radzhabova c240e0e89e [SSE] Fix Bug 48247 2021-01-22 00:45:44 +03:00