Commit Graph

4 Commits

Author SHA1 Message Date
Samuel Georges 81a02cea96 Refs #795: Combine TimePicker and DatePicker 2014-11-26 17:57:59 +11:00
Sam Georges c32ba4cbad Minor code clean 2014-11-04 17:41:48 +11:00
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
Dmitriy d055bbedaa Rename Datepicker.php to DatePicker.php 2014-10-16 22:03:10 +03:00