TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,680 Commits 1 Branch 0 Tags
a987808bdf6d153ec2fe75d983979c614784c17d
Commit Graph

1864 Commits

Author SHA1 Message Date
touffies
a987808bdf Add new method redirectToListTemplateWithId 2013-12-11 20:58:00 +01:00
touffies
4990d0fd7b Fix duplicate route id 2013-12-11 20:55:00 +01:00
touffies
ae8f4021c6 Pass the object id to the request 2013-12-11 20:54:30 +01:00
touffies
8034ddcc4d Add comments 2013-12-11 20:53:30 +01:00
touffies
7eca83889a Merge branch 'master' into frontend 2013-12-11 18:54:50 +01:00
touffies
eae8ffe764 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-12-11 18:53:42 +01:00
touffies
dee49ac213 Add comments 2013-12-11 18:44:25 +01:00
touffies
12d4c0fdfd Keep hidden field for local 2013-12-11 18:40:42 +01:00
touffies
1b07e55396 Use $locale instead of $this->getCurrentEditionLocale() in the hydrateSeoForm method 2013-12-11 18:14:48 +01:00
Etienne Roudeix
ff828bf1ba test rewritten url reassignment 2013-12-11 13:10:03 +01:00
Etienne Roudeix
63f48b79da fix rewrinting tests 2013-12-10 15:56:59 +01:00
Etienne Roudeix
f9d4fe1e5c Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-10 15:55:07 +01:00
Etienne Roudeix
83cac71895 fix urls in loops 2013-12-10 15:48:22 +01:00
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
5c602bc2cb Translation replace tab by 4 spaces 2013-12-09 15:19:15 +01:00
Etienne Roudeix
28d2add37d fix tests 2013-12-09 15:02:09 +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
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
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
945921048e Add new SEO form 2013-12-09 14:46:07 +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
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
f4a2744d19 url management in backoffice 2013-12-09 11:28:13 +01:00
Etienne Roudeix
cc4fce9add Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-09 10:29:49 +01:00
Manuel Raynaud
9885c67ade add some phpdoc in TheliaEvents class 2013-12-09 09:45:06 +01:00
Etienne Roudeix
14e7181d06 rewritten url update 2013-12-06 16:35:14 +01:00
Franck Allimant
0fcbb409e3 Factorized URL desactivation in UrlRewritingTrait::markRewritenUrlObsolete() 2013-12-06 12:26:39 +01:00
Etienne Roudeix
c703f25f73 Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-06 11:51:10 +01:00
Etienne Roudeix
926ff410d1 fix #128 2013-12-06 11:50:29 +01:00
Manuel Raynaud
06c875455f remove unused constant events 2013-12-06 11:27:32 +01:00
Etienne Roudeix
d06e0a14cf Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-06 11:20:53 +01:00
Etienne Roudeix
a9a2a256fa fix updatePositionDownTest 2013-12-06 11:20:15 +01:00
Franck Allimant
5b0307b5b3 Merge branch 'master' of https://github.com/thelia/thelia 2013-12-06 10:44:39 +01:00
Franck Allimant
52c7c6c9f7 Added translation of email templates 2013-12-06 10:44:06 +01:00
Etienne Roudeix
0c5683ef25 fix close #131 2013-12-06 10:37:08 +01:00
Franck Allimant
c2292b75d4 Fixed issue #123. Introduced NumberFormat::formatStandardNumber() 2013-12-05 18:46:35 +01:00