Merge branch '1904'
49b8be3ae397
Actions

Authored by mardelle on Apr 10 2019, 8:57 AM.

Description

Merge branch '1904'

Committed

mardelle

Apr 10 2019, 8:57 AM

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
6411cad726f6	mardelle	Fix timeline operations (insert/overwrite/lift)	Apr 10 2019
ad3f67d6050e	mardelle	Merge branch 'blacklisted_effects' into 'Applications/19.04'	Apr 10 2019
7836478b62a1	juku/mardelle	New categorization and main effects filtering	Apr 10 2019

				Path	Packages
	M			data/effects/README
	M			data/kdenliveeffectscategory.rc
	A			data/preferred_effects.txt
	M			src/assets/abstractassetsrepository.hpp
	M			src/assets/abstractassetsrepository.ipp
	M			src/assets/assetlist/model/assettreemodel.cpp
	M			src/assets/assetlist/model/assettreemodel.hpp
	M			src/assets/assetlist/view/assetlistwidget.hpp
	M			src/assets/assetlist/view/qml/assetList.qml
	M			src/effects/effectlist/model/effectfilter.cpp
	M			src/effects/effectlist/model/effecttreemodel.cpp
	M			src/effects/effectlist/view/effectlistwidget.cpp
	M			src/effects/effectsrepository.cpp
	M			src/effects/effectsrepository.hpp
	M			src/mainwindow.cpp
	M			src/timeline2/model/timelinefunctions.cpp
	M			src/timeline2/model/timelinefunctions.hpp
	M			src/timeline2/view/timelinecontroller.cpp
	M			src/transitions/transitionsrepository.cpp
	M			src/transitions/transitionsrepository.hpp
	M			src/uiresources.qrc