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

..

CombineAssets.php

Merge branch 'develop' into stable

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

ComposerManager.php

Use fill()+save() instead of save()

2015-06-27 14:32:52 +10:00

Controller.php

Missing NS ref

2015-02-23 19:55:06 +11:00

ErrorHandler.php

Might reconsider this, since the exact line in twig is lost

2015-06-04 17:37:29 +10:00

MarkupManager.php

Radical reorg of some classes

2015-01-28 11:49:54 +11:00

ModelBehavior.php

Radical reorg of some classes

2015-01-28 11:49:54 +11:00

PluginBase.php

Fixed loading permissions from plugin.yaml

2016-02-15 17:23:10 -08:00

PluginManager.php

Merge branch 'develop' into stable

2016-02-27 14:55:52 +11:00

SettingsManager.php

Update SettingsManager.php

2015-12-08 11:54:38 +01:00

UpdateManager.php

Do not show disabled plugins in the update list

2016-03-25 12:37:15 +11:00

VersionManager.php

Minor update in the form change monitor API. Minor updates in the version manager to support features required for the Builder.

2015-12-06 15:01:06 -08:00