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-23 11:41:14 +02:00
2013-09-23 12:27:36 +02:00
2013-09-13 18:03:08 +02:00
2013-09-23 12:27:36 +02:00
2013-09-03 11:26:03 +02:00
2013-09-19 17:30:57 +02:00
2013-09-21 11:46:09 +02:00
2013-09-21 11:46:09 +02:00
2013-09-22 22:14:39 +02:00
2013-09-23 12:27:36 +02:00
2013-09-19 17:01:17 +02:00
2013-09-23 11:57:19 +02:00
2013-09-19 17:01:17 +02:00
2013-09-16 13:02:57 +02:00
2013-09-13 18:03:08 +02:00
2013-09-19 17:01:17 +02:00
2013-09-19 17:01:17 +02:00
2013-09-13 12:42:33 +02:00
2013-09-21 11:46:09 +02:00
2013-09-16 18:58:45 +02:00
2013-09-19 17:01:17 +02:00
2013-09-19 17:01:17 +02:00
2013-09-21 11:46:09 +02:00
2013-09-21 11:46:09 +02:00
2013-09-23 12:27:36 +02:00
2013-09-21 11:46:09 +02:00
2013-09-16 15:32:52 +02:00
2013-09-20 09:57:30 +02:00
2013-09-22 20:50:42 +02:00
2013-09-16 15:15:30 +02:00
2013-09-16 18:58:45 +02:00
2013-09-19 17:01:17 +02:00
2013-09-19 17:01:17 +02:00
2013-09-19 17:01:17 +02:00
2013-09-19 17:01:17 +02:00
2013-09-23 11:41:14 +02:00
2013-09-20 12:00:39 +02:00
2013-09-19 17:01:17 +02:00
2013-09-19 17:01:17 +02:00
2013-09-19 17:01:17 +02:00
2013-09-19 17:01:17 +02:00
2013-09-23 11:41:14 +02:00
2013-09-21 11:46:09 +02:00
2013-09-16 18:58:45 +02:00
2013-09-19 17:01:17 +02:00