11 Commits

Author SHA1 Message Date
Stefan Talen
347dff7e75 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
	modules/backend/behaviors/RelationController.php
	modules/backend/classes/WidgetManager.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/twig/Extension.php
	modules/cms/twig/PlaceholderNode.php
	modules/cms/widgets/TemplateList.php
2014-10-18 11:07:17 +02:00
Sam Georges
8ee28b214d Minor code clean 2014-10-18 14:32:06 +11:00
alekseybobkov
12175b29db Multiple updates in the back-end widgets and styles 2014-10-16 20:47:23 -07:00
Stefan Talen
202e8869b1 Updating modules/cms/classes 2014-10-11 01:22:03 +02:00
alekseybobkov
ef9a147d31 The CMS pages are now supported by the Static Pages menus 2014-10-02 15:55:55 -07:00
alekseybobkov
6b42055184 Fixes in the rich editor, improved the content block rendering code, minor fixes in the popover and form styling. 2014-09-27 23:28:38 -07:00
Anton Romanov
8ee57eee76 Update Page.php 2014-09-11 12:45:37 +08:00
Sam Georges
20e279bf4c Page URLs now support dots (.)
Add hook for cms.page.init
2014-08-21 19:47:29 +10:00
Sam Georges
acce6eb902 Add utility function to Page cms object 2014-07-11 18:50:29 +10:00
Sam Georges
d616d3ae8b Class CmsPropertyHelper has been deprecated
Cms Objects now support basic queries that return a collection
2014-05-23 19:36:22 +10:00
Sam Georges
71a5dd67ab Welcome to the world, October :-) 2014-05-14 23:24:20 +10:00