Franck Allimant 5bf51dd47e Merge branch 'catalog' ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	core/lib/Thelia/Model/Country.php
	core/lib/Thelia/Model/Profile.php
	core/lib/Thelia/Model/ProfileQuery.php
	install/insert.sql
	install/thelia.sql
	local/config/schema.xml

2013-10-24 00:16:33 +02:00

..

Area

fix cs

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

Exception

Merge branch 'master' into loops

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

Image

allow country update

2013-10-10 14:20:53 +02:00

Lang

manage lanf <=> url assignment

2013-10-23 19:04:49 +02:00

ShippingZone

fix cs

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

AddressCreateForm.php

fix cs

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

AddressUpdateForm.php

fix cs

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

AdministratorCreationForm.php

administrators management

2013-10-23 16:31:37 +02:00

AdministratorModificationForm.php

administrators management

2013-10-23 16:31:37 +02:00

AdminLogin.php

fix cs

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

AttributeAvCreationForm.php

fix cs

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

AttributeCreationForm.php

fix cs

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

AttributeModificationForm.php

fix cs

2013-09-30 10:35:34 +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 product management

2013-09-17 17:15:15 +02:00

CategoryDocumentModification.php

fix cs

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

CategoryImageModification.php

fix cs

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

CategoryModificationForm.php

Finished category related content management

2013-09-17 13:50:01 +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

ContactForm.php

finish contact process

2013-10-21 19:07:59 +02:00

ContentCreationForm.php

update default param of content model

2013-09-21 16:07:25 +02:00

ContentDocumentModification.php

fix cs

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

ContentImageModification.php

fix cs

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

ContentModificationForm.php

fix cs

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

CountryCreationForm.php

validate country creation

2013-10-07 12:46:40 +02:00

CountryModificationForm.php

fix cs

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

CouponCode.php

WIP : Coupon implementation in front : Coupon : Fixing unit tests

2013-10-17 01:38:13 +02:00

CouponCreationForm.php

Merge branch 'master' of https://github.com/thelia/thelia into coupon

2013-10-08 23:22:53 +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

- Add agreements checkbox

2013-10-16 12:38:44 +02:00

CustomerLogin.php

Add violation to password if it's existing user

2013-10-16 10:34:07 +02:00

CustomerLostPasswordForm.php

Rename text : This email does not exists exists to This email does not exists

2013-10-09 14:25:06 +02:00

CustomerModification.php

update customer general info

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

CustomerUpdateForm.php

CustomerUpdateForm - Extend CustomerCreation

2013-10-18 09:49:14 +02:00

FeatureAvCreationForm.php

fix cs

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

FeatureCreationForm.php

fix cs

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

FeatureModificationForm.php

fix cs

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

FolderCreationForm.php

WIP : Setting Folders management

2013-09-18 15:38:08 +02:00

FolderDocumentModification.php

fix cs

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

FolderImageModification.php

fix cs

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

FolderModificationForm.php

create contentModificationForm

2013-09-21 14:32:01 +02:00

InstallStep3Form.php

WIP : install wizard : step 1, 2, 3

2013-09-16 19:00:28 +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

NewsletterForm.php

verify if an email already exists in newsletter table

2013-10-22 10:58:16 +02:00

OrderDelivery.php

fix cs

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

OrderPayment.php

fix cs

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

OrderUpdateAddress.php

fix cs

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

ProductCreationForm.php

Started price tab

2013-09-23 00:57:03 +02:00

ProductDefaultSaleElementUpdateForm.php

Worked on catalog

2013-10-23 23:47:44 +02:00

ProductDocumentModification.php

fix cs

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

ProductImageModification.php

fix cs

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

ProductModificationForm.php

fix cs

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

ProductSaleElementUpdateForm.php

Worked on catalog

2013-10-23 23:41:39 +02:00

ProfileCreationForm.php

WIP : admin profiles

2013-10-21 11:44:33 +02:00

ProfileModificationForm.php

WIP : admin profiles

2013-10-21 11:44:33 +02:00

ProfileUpdateModuleAccessForm.php

administrators management

2013-10-23 16:31:37 +02:00

ProfileUpdateResourceAccessForm.php

administrators management

2013-10-23 16:31:37 +02:00

StandardDescriptionFieldsTrait.php

Finished category related content management

2013-09-17 13:50:01 +02:00

TaxCreationForm.php

new model

2013-10-21 08:10:55 +02:00

TaxModificationForm.php

new model

2013-10-21 08:10:55 +02:00

TaxRuleCreationForm.php

fix cs

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

TaxRuleModificationForm.php

tax rule creation

2013-10-11 13:51:30 +02:00

TaxRuleTaxListUpdateForm.php

fix cs

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

TemplateCreationForm.php

fix cs

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

TemplateModificationForm.php

fix cs

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