Commit Graph

2357 Commits

Author SHA1 Message Date
Manuel Raynaud
fdd8d306a8 remove font in web dir 2013-11-12 10:25:57 +01:00
Franck Allimant
3ca3b4521b The asset manager is now a service in the container. 2013-11-12 02:12:56 +01:00
Franck Allimant
d941134c84 Implemented new assets generation system (cssembed no more required) 2013-11-12 01:32:29 +01:00
Franck Allimant
d2087b994a Fixed customer edit routes 2013-11-09 19:38:38 +01:00
Franck Allimant
f6fc886d06 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Controller/Admin/CustomerController.php
2013-11-09 18:31:52 +01:00
Franck Allimant
ac74c1d61d Refactored back-office customer management 2013-11-09 18:28:01 +01:00
Etienne Roudeix
be9aba9fb8 fix stuff + module management 2013-11-08 15:11:45 +01:00
Etienne Roudeix
e71fc7659e remove fakeCB 2013-11-08 14:37:03 +01:00
Etienne Roudeix
417ed2e324 change signature 2013-11-08 14:35:29 +01:00
Etienne Roudeix
99ad2d6820 Merge branch 'master' of github.com:thelia/thelia 2013-11-08 11:26:22 +01:00
Etienne Roudeix
422a80fcce module modification 2013-11-08 11:26:06 +01:00
Franck Allimant
85ea937570 Optimisation of THELIA_* constants usage 2013-11-08 11:22:26 +01:00
Franck Allimant
9f211a5dcb Fixed Issue #97 2013-11-07 20:01:10 +01:00
Manuel Raynaud
6b0973a7ec change request class in BaseModule 2013-11-07 16:53:49 +01:00
Manuel Raynaud
3945504387 fix use statement in BaseModuleInterface 2013-11-07 16:50:52 +01:00
Manuel Raynaud
2697ff1569 Merge pull request #99 from thelia/frontend
Frontend
2013-11-07 07:20:46 -08:00
touffies
40e8656964 Review pagination (Disable the Next or Previous button) 2013-11-07 15:51:24 +01:00
Franck Allimant
528372855f Refactired Modules classes and interface architecture 2013-11-07 15:08:01 +01:00
Franck Allimant
d2a9de682d Fixed file list bug 2013-11-07 14:57:18 +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
Manuel Raynaud
086ede3143 Merge pull request #98 from thelia/frontend
Reorder all I18N files and remove duplicate string
2013-11-07 02:19:48 -08:00
touffies
14804b269e Reorder all I18N files and remove duplicate string 2013-11-07 11:15:15 +01:00
Manuel Raynaud
503abad7b9 Merge pull request #96 from thelia/frontend
Frontend
2013-11-07 02:11:35 -08: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
Manuel Raynaud
a793dc9f3e change variable name for active front template 2013-11-07 10:47:14 +01:00
Manuel Raynaud
1357ff2001 fix issue for loading default front template 2013-11-07 10:43:47 +01:00
Manuel Raynaud
8743ac4a3c fix readme 2013-11-07 10:09:46 +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