Samuel Georges 2a7dbdd74a Merge branch 'stable' into ui ...

Conflicts:
	modules/cms/classes/CmsObject.php
	modules/cms/widgets/MediaManager.php

2016-03-25 18:42:13 +11:00

..

assetlist

UI update

2016-02-28 19:52:21 -08:00

componentlist/partials

Minor styling fix

2015-10-07 07:22:16 +11:00

mediamanager

Merge branch 'stable' into ui

2016-03-25 18:42:13 +11:00

templatelist/partials

UI update

2016-02-28 19:52:21 -08:00

AssetList.php

Implement file definitions (extensions + ignore files)

2016-02-29 18:12:26 +11:00

ComponentList.php

Minor clean ups

2015-04-29 19:50:30 +10:00

MediaManager.php

Merge branch 'develop' into stable

2016-03-25 18:39:16 +11:00

TemplateList.php

suppressDirectories -> ignoreDirectories

2016-03-21 17:19:38 +11:00