gmorel 19782f6852 Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management ...

# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia:
  Finished combination creation GUI
  Put curresncy selector in toolbar
  Started price tab
  Finished product multiple categories attachment
  Ajaxified product modification tabs
  Finished product features management
  Aded feature_template and category_template position management
  Finished product feature values
  Fixed product update process
  Added missing files
  Working catalog branch

Conflicts:
	core/lib/Thelia/Action/BaseAction.php
	install/insert.sql
	local/config/schema.xml
	templates/admin/default/folders.html
	templates/admin/default/product-edit.html

2013-09-23 12:27:36 +02:00

..

Address.php

allow address removal from front

2013-09-13 12:33:13 +02:00

Attribute.php

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

AttributeAv.php

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

BaseAction.php

Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management

2013-09-23 12:27:36 +02:00

BaseCachedFile.php

Added documents action and loop

2013-09-17 01:07:42 +02:00

Cart.php

save if producSaleElements is in promo or not

2013-09-16 10:49:42 +02:00

Category.php

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

Config.php

Started category management

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

Content.php

fix issue, default foler is set on content creation

2013-09-21 16:58:38 +02:00

Coupon.php

WIP : Coupon event dispatcher + action

2013-09-12 17:21:49 +02:00

Currency.php

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

Customer.php

valid customer removal

2013-09-12 12:40:14 +02:00

Document.php

Added documents action and loop

2013-09-17 01:07:42 +02:00

Feature.php

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

FeatureAv.php

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

Folder.php

implement process for changing folder position

2013-09-20 20:38:39 +02:00

HttpException.php

call display403 method

2013-09-12 17:13:52 +02:00

Image.php

Working : Image management set on Category

2013-09-22 20:50:42 +02:00

Message.php

Started category management

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

Order.php

order process

2013-09-20 16:25:46 +02:00

Product.php

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

Template.php

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00