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
..
Chat.js	Fix changing user name	2020-12-18 13:23:14 +03:00
Comments.js	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).	2021-02-04 12:39:56 +03:00
Desktop.js	[desktop] fixed wrong action click	2020-10-28 22:59:24 +03:00
ExternalDiagramEditor.js	[dark theme] changed storage key name	2021-02-06 12:55:47 +03:00
ExternalMergeEditor.js	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
Fonts.js	Mentions: use hasAccess user option	2019-06-25 15:05:14 +03:00
History.js	Fix selecting revision	2020-12-10 19:00:33 +03:00
Plugins.js	Fix layout for plugins tab	2020-12-22 14:39:26 +03:00
Protection.js	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
ReviewChanges.js	[DE] Change name for guest user	2020-12-10 14:48:03 +03:00
Themes.js	[dark theme] added 'Themes' controller	2021-02-06 13:03:46 +03:00