Commit Graph

2336 Commits

Author SHA1 Message Date
Manuel Raynaud
07b88266e9 refactor pdf generator 2013-11-08 09:41:20 +01:00
touffies
555040fcab Add PDF for Order Details on the account page 2013-11-07 17:15:47 +01:00
touffies
40e8656964 Review pagination (Disable the Next or Previous button) 2013-11-07 15:51:24 +01:00
touffies
a95021fcea Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-11-07 13:03:44 +01:00
touffies
45f3dbe172 Issue 76
Currency sign next to the price
2013-11-07 13:03:00 +01:00
touffies
97f2e82084 Issue 76
Currency sign next to the price
2013-11-07 12:56:12 +01:00
touffies
aa7efb0e9a Issue 61
Add the newsletter registration on Register page
2013-11-07 12:35:34 +01:00
touffies
eb1f509c67 Zipcode translation error on the french version 2013-11-07 12:19:27 +01:00
touffies
bccce8d531 Registration: change the label on the submit button 2013-11-07 12:12:51 +01:00
touffies
316990dedb Change the french translation of Register 2013-11-07 12:06:09 +01:00
touffies
7fa17215f6 ISSUE 63 - Newsletter registration : error message 2013-11-07 11:57:43 +01:00
touffies
14804b269e Reorder all I18N files and remove duplicate string 2013-11-07 11:15:15 +01:00
touffies
4007ae39d4 Merge branch 'master' into frontend
Conflicts:
	templates/default/I18n/en_US.php

Reorder all I18N files
2013-11-07 11:09:07 +01:00
Etienne Roudeix
c6cd32fec2 last cart item retreiver 2013-11-07 09:04:41 +01:00
Franck Allimant
dae07e1061 Fixed issue #86 2013-11-07 00:12:06 +01:00
Franck Allimant
6203b4f13c Fixed Issue #84 2013-11-06 23:05:36 +01:00
Franck Allimant
542c4d1641 Improved the translatable text recognition regex 2013-11-06 22:56:00 +01:00
touffies
483fd52734 Remove html if empty value (ex : Product without images does not need the carousel) 2013-11-06 20:17:47 +01:00
touffies
42770025ce Add default image thumbnail 2013-11-06 20:15:38 +01:00
Franck Allimant
907802b5cb Merge branch 'master' of https://github.com/thelia/thelia 2013-11-06 20:02:13 +01:00
Franck Allimant
f8f68eb59b Fixed minor internationalizable string error in admin templates. 2013-11-06 20:01:26 +01:00
touffies
e262c41987 Add sample product and default message when you install thelia 2013-11-06 19:30:52 +01:00
touffies
250cc5adde Merge branch 'master' into frontend 2013-11-06 19:01:10 +01:00
touffies
14e5ee62a7 Hide pagination if there is only 1 page 2013-11-06 18:57:22 +01:00
touffies
bd158a5233 Add sample product and default message when you install thelia 2013-11-06 17:11:28 +01:00
Manuel Raynaud
14aa93a32d Merge branch 'master' of github.com:thelia/thelia 2013-11-06 16:05:57 +01:00
Manuel Raynaud
7c897c758d fiw method calling default front tempalte 2013-11-06 15:50:37 +01:00
touffies
ebfd58c2a3 Change alt attr for the product thumbnail 2013-11-06 15:40:19 +01:00
touffies
453a818c55 Display the number of results (Items) on the category page or search page 2013-11-06 15:17:52 +01:00
Franck Allimant
8d40605091 Continued on translations 2013-11-06 14:40:33 +01:00
Manuel Raynaud
b1517945f4 Merge branch 'modules'
Conflicts:
	core/lib/Thelia/Controller/Admin/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Thelia.php
2013-11-06 14:37:31 +01:00
Manuel Raynaud
6e5ae0f634 refactor render template process 2013-11-06 13:48:32 +01:00
Franck Allimant
f3b13163f0 Merge branch 'master' of https://github.com/thelia/thelia 2013-11-06 11:16:46 +01:00
Franck Allimant
ead038723f Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Template.php
2013-11-06 11:16:27 +01:00
Manuel Raynaud
2d291cf5a0 refactor how to assign template to parser 2013-11-06 11:12:39 +01:00
Etienne Roudeix
61e34a1383 Merge branch 'master' of github.com:thelia/thelia 2013-11-06 11:07:59 +01:00
Etienne Roudeix
3db7344373 fix tests 2013-11-06 11:07:31 +01:00
Manuel Raynaud
792ad9c646 Merge pull request #95 from thelia/frontend
Frontend
2013-11-06 02:03:26 -08:00
touffies
1471a8ed21 Remove duplicate icon error 2013-11-06 10:57:12 +01:00
touffies
3f8a68802b Add language strings for the toolbar 2013-11-06 10:49:27 +01:00
Franck Allimant
361e4a9d74 Implementing translations (still in progress) 2013-11-06 10:49:03 +01:00
Etienne Roudeix
48502e04e4 phpdoc 2013-11-06 10:42:34 +01:00
Manuel Raynaud
9685fa95dc Merge pull request #94 from thelia/frontend
Frontend
2013-11-06 01:41:27 -08:00
Etienne Roudeix
0c687408e4 Merge branch 'master' of github.com:thelia/thelia 2013-11-06 10:28:56 +01:00
Etienne Roudeix
b9babff070 comment 2013-11-06 10:28:29 +01:00
Etienne Roudeix
488ee3e8f4 lil loop refactor 2013-11-06 10:26:29 +01:00
touffies
4c844133fe Missing single quote for the french translation 2013-11-06 10:25:30 +01:00
touffies
9f26cc3b58 Translation of the remove link 2013-11-06 10:14:28 +01:00
touffies
8ace57200c Error placeholder contact email 2013-11-06 09:59:14 +01:00
touffies
bbcda888cf Merge branch 'master' into frontend
Conflicts:
	templates/default/I18n/fr_FR.php
2013-11-06 09:58:34 +01:00