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

..

collection

Fix Bug 35626.

2017-08-17 15:39:28 +03:00

component

[DE][PE][SSE] synchronize extra buttons state through events

2018-02-16 02:56:17 +03:00

controller

Merge branch 'develop' into feature/desktop-new

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

core

change license to 2017

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

extend

[SSE] Apply bullets and numbering to text in shape (need changes in api).

2017-05-18 10:31:18 +03:00

model

Added groups for plugins.

2017-12-07 17:46:13 +03:00

mods

Scroll refactoring: fix horizontal scroll.

2018-02-10 15:47:08 +03:00

template

Fix Bug 35896.

2017-09-28 14:02:33 +03:00

util

Merge branch 'develop' into feature/desktop-new

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

view

Merge branch 'develop' into feature/desktop-new

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