touffies
6648613772
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
Conflicts:
core/lib/Thelia/Action/BaseAction.php
core/lib/Thelia/Controller/Admin/AbstractSeoCrudController.php
core/lib/Thelia/Controller/Admin/ProductController.php
core/lib/Thelia/Core/Event/UpdateSeoEvent.php
core/lib/Thelia/Form/ProductModificationForm.php
core/lib/Thelia/Form/SeoFieldsTrait.php
core/lib/Thelia/Model/Base/Product.php
core/lib/Thelia/Model/Base/ProductI18n.php
core/lib/Thelia/Model/Base/ProductI18nQuery.php
core/lib/Thelia/Model/Map/ProductI18nTableMap.php
core/lib/Thelia/Model/Map/ProductTableMap.php
install/thelia.sql
local/config/schema.xml
templates/backOffice/default/includes/product-general-tab.html
templates/backOffice/default/includes/seo-tab.html
templates/backOffice/default/product-edit.html
2013-12-09 15:22:17 +01:00
..
2013-11-05 14:59:15 +01:00
2013-10-30 15:35:11 +01:00
2013-10-18 09:28:17 +02:00
2013-10-30 15:44:32 +01:00
2013-09-30 10:35:34 +02:00
2013-12-09 15:00:51 +01:00
2013-09-30 10:35:34 +02:00
2013-10-18 09:28:17 +02:00
2013-10-24 10:36:06 +02:00
2013-12-09 15:00:51 +01:00
2013-09-30 10:10:44 +02:00
2013-12-09 15:00:51 +01:00
2013-10-18 09:28:17 +02:00
2013-11-24 22:27:26 +01:00
2013-09-30 10:26:59 +02:00
2013-11-09 18:28:01 +01:00
2013-10-29 12:22:34 +01:00
2013-10-30 15:44:32 +01:00
2013-09-30 10:35:34 +02:00
2013-12-09 15:00:51 +01:00
2013-11-13 14:48:35 +01:00
2013-10-29 12:22:34 +01:00
2013-10-25 10:07:21 +02:00
2013-10-28 12:24:59 +01:00
2013-11-27 21:21:07 +01:00
2013-11-08 11:26:06 +01:00
2013-10-25 10:07:21 +02:00
2013-11-27 21:21:07 +01:00
2013-10-18 09:28:17 +02:00
2013-12-09 15:22:17 +01:00
2013-12-05 15:57:56 +01:00
2013-10-25 10:07:21 +02:00
2013-10-18 09:28:17 +02:00
2013-10-25 10:07:21 +02:00
2013-10-25 10:07:21 +02:00
2013-09-30 10:35:34 +02:00