Manuel Raynaud
462b2bec5e
Merge branch 'master' into frontend
...
Conflicts:
templates/backOffice/default/folder-edit.html
2013-12-09 16:15:58 +01:00
touffies
f34a4a066d
Remove RewrittenUrlTestTrait from content
2013-12-09 15:40:23 +01:00
Manuel Raynaud
4c9eff379a
Merge pull request #138 from gmorel/french_translation
...
Adding some French translation for backoffice
2013-12-09 06:39:21 -08:00
Etienne Roudeix
95d327f976
fix tests
2013-12-09 15:31:27 +01:00
touffies
50d638bb23
Remove test setURL
2013-12-09 15:30:04 +01:00
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
gmorel
2f37f339ee
Adding translation for Backoffice
2013-12-09 15:19:15 +01:00
gmorel
80eb4b7bd0
Adding translation for Backoffice
2013-12-09 15:19:15 +01:00
gmorel
c110e4e812
Adding translation for Backoffice
2013-12-09 15:19:15 +01:00
gmorel
5c602bc2cb
Translation replace tab by 4 spaces
2013-12-09 15:19:15 +01:00
gmorel
601aaf311d
Adding translation for Backoffice
2013-12-09 15:19:15 +01:00
gmorel
b8b6887fea
Fix typo
2013-12-09 15:19:15 +01:00
gmorel
f31ed34ee3
Fix typo
2013-12-09 15:19:15 +01:00
gmorel
fcb626e784
Fix typo
2013-12-09 15:19:15 +01:00
gmorel
7f33c86d75
Adding translation for Backoffice
2013-12-09 15:19:15 +01:00
gmorel
83356ab867
Fix typo
2013-12-09 15:19:15 +01:00
gmorel
5f833f256f
Adding translation for Backoffice
2013-12-09 15:19:15 +01:00
gmorel
d658351343
Fix typo
2013-12-09 15:19:15 +01:00
gmorel
ae88efd282
Adding translation for Backoffice
2013-12-09 15:19:15 +01:00
gmorel
a064489fe4
Adding translation for Backoffice
2013-12-09 15:19:15 +01:00
gmorel
502a171c0d
Adding translation for Backoffice
2013-12-09 15:19:15 +01:00
gmorel
d769f51186
Fix typo
2013-12-09 15:19:14 +01:00
gmorel
8ba353dd6c
Adding translation for Backoffice
2013-12-09 15:19:14 +01:00
gmorel
0d69d226f3
Adding translation for Backoffice
2013-12-09 15:19:14 +01:00
gmorel
80d1656762
Adding translation for Backoffice
2013-12-09 15:19:14 +01:00
Etienne Roudeix
28d2add37d
fix tests
2013-12-09 15:02:09 +01:00
touffies
cd0c3342e2
Add missing page for folder
2013-12-09 15:00:52 +01:00
touffies
d476672150
Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT
2013-12-09 15:00:51 +01:00
touffies
0684ec2b42
Rename meta_keyword to meta_keywords
...
Add SEO to folder
2013-12-09 14:52:46 +01:00
touffies
0d8e9437b1
Remove space before Doctype HTML
2013-12-09 14:52:45 +01:00
touffies
d6f39787d0
Add to the context the site URL based on the language (Used in the SEO tab)
2013-12-09 14:52:45 +01:00
touffies
71302493c1
Add a new method to get the site URL based on the language
2013-12-09 14:52:45 +01:00
touffies
3d48eab76c
Remove unused variable $current_id
2013-12-09 14:52:44 +01:00
touffies
2d9e2df5a4
Missing hidden field product_id for the redirection when the user click "Save"
2013-12-09 14:52:44 +01:00
touffies
c1140ec279
Extend AbstractCrudController to manage the SEO methods
2013-12-09 14:52:44 +01:00
touffies
5980ff44fc
Hydrate SeoForm under SEO Tab
2013-12-09 14:52:44 +01:00
touffies
083f3bfa8c
Move URL to SeoForm (SEO tab)
2013-12-09 14:52:44 +01:00
touffies
6447385605
Add Action + Event to manage SEO information
2013-12-09 14:51:51 +01:00
touffies
9bbaaf75a4
Add new route to save the product SEO information
2013-12-09 14:49:20 +01:00
touffies
9d88552492
Add action buttons at the bottom of the product General tab
2013-12-09 14:49:20 +01:00
touffies
ba48bc985e
Add SEO tab for a product
2013-12-09 14:46:07 +01:00
touffies
945921048e
Add new SEO form
2013-12-09 14:46:07 +01:00
touffies
0d5cfd29e0
Add new fields (meta_title, meta_description and meta_keyword) under I18N Product
2013-12-09 14:46:06 +01:00
Etienne Roudeix
79e4193791
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
2013-12-09 13:02:04 +01:00
Etienne Roudeix
090b201fea
test rewriting
2013-12-09 13:01:39 +01:00
Manuel Raynaud
80a17e6438
Merge pull request #135 from gmorel/french_translation
...
Translation : Ordering existing translations by keys
2013-12-09 03:22:07 -08:00
Manuel Raynaud
c88d9ccf6f
Merge pull request #137 from thelia/adminInclude
...
display admin hook if in debug mode and specific parameter in url
2013-12-09 03:19:57 -08:00
Franck Allimant
bf64cd117e
Translation : Ordering existing translations by keys. This should ease the merge process when conflicts occur
...
Fixed issue #123 . Introduced NumberFormat::formatStandardNumber()
Adding translation for Backoffice
Adding translation for Backoffice
fix close #131
fix updatePositionDownTest
Translation : Ordering existing translations by keys. This should ease the merge process when conflicts occur
Translation : Ordering existing translations by keys, This should ease the merge process when conflicts occur
Translation : Ordering existing translations by keys, This should ease the merge process when conflicts occur
2013-12-09 12:14:15 +01:00
Manuel Raynaud
8944446776
display admin hook if in debug mode and specific parameter in url
2013-12-09 12:12:20 +01:00
Etienne Roudeix
1e8fee99cb
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
2013-12-09 11:28:47 +01:00
