Maxim Kadushkin 482a7d11bf Merge branch 'develop' into feature/desktop-new ...

# Conflicts:
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/controller/Toolbar.js
#	apps/presentationeditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/controller/Main.js

2018-02-22 02:41:49 +03:00

..

Chat.js

Fix Bug 31420.

2017-11-24 15:02:52 +03:00

Comments.js

Fix Bug 36936.

2018-02-15 11:57:48 +03:00

Desktop.js

[common] added 'Desktop' controller

2018-02-22 02:24:03 +03:00

ExternalDiagramEditor.js

Fix Bug 36885.

2018-02-08 18:22:32 +03:00

ExternalMergeEditor.js

Fix chart editing in the desktop.

2017-12-06 10:06:45 +03:00

Fonts.js

change license to 2017

2017-01-17 17:58:08 +03:00

History.js

[DE] Set serverVersion parameter to version history items.

2017-09-22 17:18:06 +03:00

Plugins.js

Merge branch 'hotfix/v5.0.7' into develop

2018-01-15 16:11:11 +03:00

Protection.js

Refactoring signatures: enable adding invisible signature when document is signed.

2017-11-28 15:52:30 +03:00

ReviewChanges.js

Merge branch 'develop' into hotfix/v5.0.6

2017-12-11 13:24:21 +03:00