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
..
collection	Merge branch 'hotfix/v5.2.8' into develop	2019-02-05 16:43:52 +03:00
component	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
controller	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
core	[SSE] Fix Bug 46126	2020-08-14 16:58:41 +03:00
extend	Fix Bug 43332 (#258)	2019-10-29 15:32:13 +03:00
model	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
mods	Fix bug 43076, Bug 43119, Bug 43074	2019-10-11 10:59:16 +03:00
template	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
util	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
view	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00