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

..

AutoCorrectDialog.template

Fix translation

2020-12-25 10:47:57 +03:00

Chat.template

…

Comments.template

Merge branch 'develop' into feature/colors-table

2021-02-06 14:42:56 +03:00

CommentsPanel.template

[All] Update jquery (fix bugs)

2020-06-05 16:10:48 +03:00

CommentsPopover.template

Merge branch 'develop' into feature/colors-table

2021-02-06 14:42:56 +03:00

ExtendedColorDialog.template

…

Header.template

…

ReviewChangesPopover.template

Add parameter to api config: customization.reviewPermissions (user name must be prefixed)

2020-08-04 22:20:20 +03:00