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
|
fff64a30a7
|
FormWidget registrations use a "code" not an "alias", it is confusing with defaultAlias property in widgetbase
|
2014-10-18 10:47:36 +11:00 |
|
Stefan Talen
|
7dc24cfff1
|
Updating backend/classes
|
2014-10-10 23:12:50 +02:00 |
vagrant
|
848376028f
|
Add test for makeWidget()
|
2014-09-20 10:33:09 +00:00 |
|
Sam Georges
|
56d0c3351b
|
private -> protected
|
2014-08-01 14:54:16 +10:00 |
|
Sam Georges
|
73d8d751a1
|
Refs #188 Tidy up notes
|
2014-05-21 09:39:42 +10:00 |
Pascal Borreli
|
459c8e0cfa
|
Fixed typos
|
2014-05-17 18:08:01 +02:00 |
|
Sam Georges
|
71a5dd67ab
|
Welcome to the world, October :-)
|
2014-05-14 23:24:20 +10:00 |