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

Browse Source

# 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

...

This commit is contained in:

gmorel

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

parent c1d89e85c9 e7974a21a7

commit 19782f6852

81 changed files with 5045 additions and 2297 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2512

local/config/schema.xml

File diff suppressed because it is too large Load Diff