Etienne Roudeix abe45c5798 Merge branch 'master' into tax ...

Conflicts:
	core/lib/Thelia/Config/Resources/action.xml
	core/lib/Thelia/Controller/Admin/AddressController.php
	core/lib/Thelia/Controller/Admin/CustomerController.php
	core/lib/Thelia/Controller/Admin/ModuleController.php

2013-10-21 17:48:13 +02:00

..

Output

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Skeleton/Module

fix cs

2013-10-18 09:28:17 +02:00

BaseModuleGenerate.php

add some phpdoc

2013-09-01 11:32:05 +02:00

CacheClear.php

dispatching event for clearing cache

2013-10-18 08:25:42 +02:00

ClearImageCache.php

refactor order and image events

2013-09-30 10:34:08 +02:00

ContainerAwareCommand.php

apply cs-fixer

2013-08-14 09:29:04 +02:00

CreateAdminUser.php

permission cleanup

2013-10-21 17:44:17 +02:00

Install.php

fix cs

2013-10-18 09:28:17 +02:00

ModuleActivateCommand.php

fix cs

2013-10-18 09:28:17 +02:00

ModuleGenerateCommand.php

start validating module.xml file

2013-10-17 11:32:29 +02:00

ModuleGenerateModelCommand.php

add some phpdoc

2013-09-01 11:32:05 +02:00

ModuleGenerateSqlCommand.php

add some phpdoc

2013-09-01 11:32:05 +02:00

ReloadDatabaseCommand.php

fix cs

2013-09-30 10:35:34 +02:00