TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into loops

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
This commit is contained in:
Etienne Roudeix
2013-08-21 09:19:56 +02:00
parent 6a14bef3de a0b82879f5
commit 86b11096ba
3275 changed files with 929970 additions and 274940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
documentation/api/files/Form/CustomerCreation.php.txt Normal file → Executable file
View File

@@ -33,6 +33,7 @@ class CustomerCreation extends BaseForm
protected function buildForm()
{
$this->formBuilder
->add("auto_login", "integer")
->add("firstname", "text", array(
"constraints" => array(
new Constraints\NotBlank()
@@ -163,3 +164,4 @@ class CustomerCreation extends BaseForm
return "thelia_customer_creation";
}
}