Etienne Roudeix 233c952b4e Merge branch 'master' into template ...

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	core/lib/Thelia/Model/Base/Module.php
	core/lib/Thelia/Model/Base/ModuleQuery.php
	core/lib/Thelia/Model/Map/ModuleTableMap.php
	install/thelia.sql
	local/config/schema.xml

2013-09-17 12:44:34 +02:00

..

Exception

Merge branch 'master' into loops

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

AddressCreateForm.php

allow to make an address as default on update action

2013-09-13 10:17:45 +02:00

AddressUpdateForm.php

- Add creation address form

2013-09-11 13:32:21 +02:00

AdminLogin.php

Beautiful login page

2013-09-16 15:14:26 +02:00

AttributeAvCreationForm.php

AttributesAv management

2013-09-12 15:43:37 +02:00

AttributeCreationForm.php

Finished admin controllers refactoriing

2013-09-12 13:39:47 +02:00

AttributeModificationForm.php

Finished attributes management

2013-09-13 00:19:53 +02:00

BaseForm.php

complete login form

2013-09-10 12:16:19 +02:00

CartAdd.php

update CartAdd form

2013-09-16 11:47:03 +02:00

CategoryCreationForm.php

Started category management

2013-09-16 18:58:45 +02:00

CategoryModificationForm.php

Started category management

2013-09-16 18:58:45 +02:00

ConfigCreationForm.php

fix cs

2013-09-11 08:27:40 +02:00

ConfigModificationForm.php

fix cs

2013-09-11 08:27:40 +02:00

CountryCreationForm.php

- Edit country view creation

2013-09-16 12:55:34 +02:00

CountryModificationForm.php

- Edit country view creation

2013-09-16 12:55:34 +02:00

CouponCreationForm.php

WIP : Coupon fix coupon creation issue

2013-09-13 18:03:08 +02:00

CurrencyCreationForm.php

Working : For attributes on labels

2013-09-05 16:52:17 +02:00

CurrencyModificationForm.php

fix cs

2013-09-11 08:27:40 +02:00

CustomerCreation.php

finish registration form

2013-09-11 12:30:05 +02:00

CustomerLogin.php

fix cs

2013-09-11 08:27:40 +02:00

CustomerLostPasswordForm.php

add missing files

2013-09-11 17:24:26 +02:00

CustomerModification.php

update customer general info

2013-09-12 11:24:24 +02:00

FeatureAvCreationForm.php

Finished Features management

2013-09-16 10:40:52 +02:00

FeatureCreationForm.php

Finished Features management

2013-09-16 10:40:52 +02:00

FeatureModificationForm.php

Finished Features management

2013-09-16 10:40:52 +02:00

MessageCreationForm.php

Working :

2013-09-06 12:55:53 +02:00

MessageModificationForm.php

fix cs

2013-09-11 08:27:40 +02:00

OrderDelivery.php

delivery process

2013-09-17 12:38:23 +02:00

ProductCreationForm.php

Factorized creation and confirmation modal dialogs

2013-09-06 20:00:02 +02:00

StandardDescriptionFieldsTrait.php

fix cs

2013-09-11 08:27:40 +02:00

TemplateCreationForm.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

TemplateModificationForm.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00