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

..

Action

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

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

Cart

order creation

2013-09-19 15:11:54 +02:00

Command

Merge branch 'master' into template

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

Config

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

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

Constraint

Working : Coupon : Fix unit tests @todo refactor

2013-09-16 11:26:37 +02:00

Controller

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

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

Core

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

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

Coupon

add abstract getDispatcher method to use CartTrai

2013-09-19 16:06:42 +02:00

Exception

order process

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

Form

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

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

Install

test if cache directory exists before launching debug bar

2013-09-18 09:34:48 +02:00

Log

apply cs-fixer

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

Mailer

fix typo

2013-09-16 19:08:01 +02:00

Model

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

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

Module

order process

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

Rewriting

fix current url bug + fix empty loop pagination exception

2013-09-12 17:20:33 +02:00

TaxEngine

order process

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

Tests

Working : Image management set on Category

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

Tools

Working : Image management set on Category

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

Type

tax engine

2013-09-11 16:21:51 +02:00