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

2639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
touffies
12d4c0fdfd Keep hidden field for local 2013-12-11 18:40:42 +01:00
touffies
01850c7d17 - Define close_url 
- Use notifications.html
 2013-12-11 18:33:03 +01:00
touffies
1b07e55396 Use $locale instead of $this->getCurrentEditionLocale() in the hydrateSeoForm method 2013-12-11 18:14:48 +01:00
touffies
8c20202778 Add dismissable 2013-12-11 18:13:28 +01:00
touffies
f51d540950 Wrong Form Action for SEO 2013-12-09 16:45:06 +01:00
touffies
f34a4a066d Remove RewrittenUrlTestTrait from content 2013-12-09 15:40:23 +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
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
Etienne Roudeix
f4a2744d19 url management in backoffice 2013-12-09 11:28:13 +01:00
Manuel Raynaud
adc7773f96 Merge pull request #136 from mespeche/master 
Adding hook module to content and folder edition page.
 2013-12-09 01:44:57 -08:00
Manuel Raynaud
706becf574 complete readme file 2013-12-09 10:42:54 +01:00
Michaël Espeche
990cda786d Add of hook module to content and folder edition page. 2013-12-09 10:36:09 +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
Manuel Raynaud
10c662d24d Merge pull request #134 from gmorel/french_translation 
Adding some French translation for backoffice
 2013-12-08 01:36:58 -08:00
Franck Allimant
592b306b9e Fixed nt,-group css rule which caused garbage in top bar buttons 2013-12-07 09:58:01 +01:00
gmorel
c773e2fd4e Merge remote-tracking branch 'origin/french_translation' into french_translation 2013-12-06 17:22:33 +01:00
gmorel
40c47affec Adding translation for Backoffice 2013-12-06 17:22:07 +01:00
gmorel
3f8e1dc89b Adding translation for Backoffice 2013-12-06 17:22:07 +01:00
Etienne Roudeix
14e7181d06 rewritten url update 2013-12-06 16:35:14 +01:00
Manuel Raynaud
a3570b4e16 Merge branch 'master' of github.com:thelia/thelia 2013-12-06 16:00:37 +01:00
Manuel Raynaud
71d9524291 fix wrong integration in product template 2013-12-06 16:00:15 +01:00
gmorel
2e1a6a3136 Adding translation for Backoffice 2013-12-06 14:34:33 +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