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-08-21 09:19:56 +02:00
2013-09-22 20:50:42 +02:00
2013-09-13 10:17:45 +02:00
2013-09-11 13:32:21 +02:00
2013-09-16 15:14:26 +02:00
2013-09-12 15:43:37 +02:00
2013-09-12 13:39:47 +02:00
2013-09-13 00:19:53 +02:00
2013-09-10 12:16:19 +02:00
2013-09-16 11:47:03 +02:00
2013-09-17 17:15:15 +02:00
2013-09-22 20:50:42 +02:00
2013-09-17 13:50:01 +02:00
2013-09-11 08:27:40 +02:00
2013-09-11 08:27:40 +02:00
2013-09-21 16:07:25 +02:00
2013-09-22 20:50:42 +02:00
2013-09-21 14:32:01 +02:00
2013-09-16 12:55:34 +02:00
2013-09-16 12:55:34 +02:00
2013-09-13 18:03:08 +02:00
2013-09-05 16:52:17 +02:00
2013-09-11 08:27:40 +02:00
2013-09-11 12:30:05 +02:00
2013-09-11 08:27:40 +02:00
2013-09-11 17:24:26 +02:00
2013-09-12 11:24:24 +02:00
2013-09-16 10:40:52 +02:00
2013-09-16 10:40:52 +02:00
2013-09-16 10:40:52 +02:00
2013-09-18 15:38:08 +02:00
2013-09-22 20:50:42 +02:00
2013-09-21 14:32:01 +02:00
2013-09-16 19:00:28 +02:00
2013-09-06 12:55:53 +02:00
2013-09-11 08:27:40 +02:00
2013-09-19 19:56:59 +02:00
2013-09-19 15:59:16 +02:00
2013-09-23 00:57:03 +02:00
2013-09-23 00:57:03 +02:00
2013-09-22 20:50:42 +02:00
2013-09-17 17:31:22 +02:00
2013-09-20 12:00:39 +02:00
2013-09-17 13:50:01 +02:00
2013-09-16 09:23:44 +02:00
2013-09-16 09:23:44 +02:00