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
..
2013-09-05 20:07:17 +02:00
2013-08-12 10:07:37 +02:00
2013-09-09 16:40:53 +02:00
2013-09-23 12:27:36 +02:00
2013-09-19 09:07:53 +02:00
2013-09-01 11:32:05 +02:00
2013-09-23 00:57:03 +02:00
2013-09-12 17:28:02 +02:00
2013-09-17 16:38:16 +02:00
2013-09-16 09:23:44 +02:00
2013-09-23 12:27:36 +02:00
2013-09-11 08:27:40 +02:00
2013-09-01 11:32:05 +02:00
2013-09-17 15:43:15 +02:00
2013-09-01 11:32:05 +02:00
2013-09-16 10:19:40 +02:00