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

40 Commits

Author SHA1 Message Date
Emmanuel Nurit
da905bcbb1 [front office] modification template default 
Displaying fields with nofilter.
Adding some missing translation strings
 2014-01-23 09:10:27 +01:00
Manuel Raynaud
1974d3e3c3 fix psr 2014-01-22 12:52:36 +01:00
Manuel Raynaud
3b3e993514 unescape variable in form 2014-01-21 14:56:51 +01:00
Manuel Raynaud
180068d252 Merge pull request #187 from enurit/master 
[front office] default template unescape title
 2014-01-20 05:01:37 -08:00
Emmanuel Nurit
83dd514114 [front office] default template unescape tile 2014-01-20 12:07:58 +01:00
Michaël Espeche
6401266226 Filter management optimization for ajax use 2014-01-16 11:13:52 +01:00
Manuel Raynaud
0c564be4c5 Merge branch 'master' of https://github.com/enurit/thelia into enurit-master 
Conflicts:
	templates/frontOffice/default/I18n/fr_FR.php
 2014-01-14 19:21:01 +01:00
Emmanuel Nurit
1f1fd3e90f [front office] translation fixes 2014-01-14 15:52:12 +01:00
Emmanuel Nurit
b6a4ae7749 [Back-office] Add core translation 2014-01-14 15:18:03 +01:00
enurit
d4f47333f2 Front Translation 
Adding translation for front default template
 2014-01-10 15:33:59 +01:00
enurit
08edf1a4c0 French translation default template 
Adding some missing translations
 2014-01-10 15:23:53 +01:00
enurit
535f3dd850 update breadcrumb.tpl unescape the last item 
The last item need to be unescape too
 2014-01-07 11:02:08 +01:00
Etienne Roudeix
99038e688a Revert "Revert "Merge branch 'cleanmaster' into modules"" 
This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php
 2014-01-06 11:25:25 +01:00
Etienne Roudeix
39c1b43249 need to unescape breadcrumb strings after been in array 2013-12-23 12:25:15 +01:00
Etienne Roudeix
22efc21bfe dynamic delivery modules on delivery front template 2013-12-20 12:14:20 +01:00
Etienne Roudeix
b3ac365b45 Revert "Merge branch 'cleanmaster' into modules" 
This reverts commit d0ff5260f7, reversing
changes made to 67d0101dbe.
 2013-12-20 11:16:42 +01:00
Etienne Roudeix
5773922314 show coupon codes in back office 2013-12-19 14:50:45 +01:00
Etienne Roudeix
d7c1ecf09a coupon management in order and cart process 2013-12-19 14:17:22 +01:00
Manuel Raynaud
d6ba2b3d65 Merge branch 'master' into frontend 2013-12-16 15:45:04 +01:00
Manuel Raynaud
aa66067f0e fix bad product assignation in feature_value loop 2013-12-14 13:50:55 +01:00
Nicolas Villa
2d781931aa Traduction front 2013-12-10 10:17:54 +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
0d8e9437b1 Remove space before Doctype HTML 2013-12-09 14:52:45 +01:00
Manuel Raynaud
71d9524291 fix wrong integration in product template 2013-12-06 16:00:15 +01:00
Manuel Raynaud
4e42d0adda Merge pull request #121 from gmorel/french_translation 
French translation
 2013-11-29 00:17:57 -08:00
Nicolas Villa
0902a195cb Fixed some translations 2013-11-29 06:38:13 +01:00
gmorel
a801f9bfb8 Merge 2013-11-28 22:32:39 +01:00
gmorel
94e2d7881d Merge branch 'master' of git://github.com/thelia/thelia into french_translation 
* 'master' of git://github.com/thelia/thelia:
  fix typo
  Implemented mail messages templates and layouts
  Email template + test email
 2013-11-27 22:22:26 +01:00
touffies
e675be4cff Email template + test email 2013-11-27 21:19:27 +01:00
gmorel
dc648fef62 Merge master 2013-11-27 20:24:38 +01:00
Manuel Raynaud
b3d3d61602 add REF to product_sale_element loop and fix product tempalte 2013-11-27 10:07:58 +01:00
touffies
2549369b45 Check if store_country has a value 2013-11-25 14:42:18 +01:00
touffies
fd0301022d Merge branch 'backoffice' into frontend 2013-11-25 10:24:29 +01:00
touffies
7f1c1bfdd8 Use Store contact information 2013-11-22 17:51:35 +01:00
touffies
85d9c112d3 Replace company_name and contact_email by store_name & store_email 2013-11-22 17:40:04 +01:00
David Rimbault
4b2a73c85d Added some translations in the Customer Creation Form 2013-11-19 23:50:23 +01:00
touffies
5b653cca32 Add warning message if there's no delivery method available 2013-11-19 09:30:35 +01:00
touffies
15ff5e422e Optimisation slider image 2013-11-19 09:29:59 +01:00
Etienne Roudeix
25192cf366 change template subdirs 2013-11-13 10:24:14 +01:00