Commit Graph

1695 Commits

Author SHA1 Message Date
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
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
aa7efb0e9a Issue 61
Add the newsletter registration on Register page
2013-11-07 12:35:34 +01:00
touffies
7fa17215f6 ISSUE 63 - Newsletter registration : error message 2013-11-07 11:57:43 +01:00
Manuel Raynaud
1357ff2001 fix issue for loading default front template 2013-11-07 10:43:47 +01:00
Etienne Roudeix
c6cd32fec2 last cart item retreiver 2013-11-07 09:04:41 +01:00
Franck Allimant
542c4d1641 Improved the translatable text recognition regex 2013-11-06 22:56:00 +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
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
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
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
bbcda888cf Merge branch 'master' into frontend
Conflicts:
	templates/default/I18n/fr_FR.php
2013-11-06 09:58:34 +01:00
Manuel Raynaud
1ccd2e63ce Merge branch 'master' of github.com:thelia/thelia 2013-11-06 09:30:17 +01:00
touffies
5bf9050a12 Delete address with ajax callback function address.delete() 2013-11-05 17:33:55 +01:00
Manuel Raynaud
833472e6eb complete french translation 2013-11-05 15:59:14 +01:00
touffies
0431010a65 Missing class Translator 2013-11-05 15:46:38 +01:00
touffies
542a8c5d20 Allow to update the label address 2013-11-05 14:59:15 +01:00
Quentin Dufour
3e1a08dc6c Correcting some typos 2013-11-04 17:37:23 +01:00
touffies
65a8953143 Profile and Useful was misspelled
Add missing language key into the dictionary
2013-11-04 16:35:01 +01:00
Etienne Roudeix
06ee460e8a Merge branch 'master' of github.com:thelia/thelia 2013-11-04 16:16:21 +01:00
Etienne Roudeix
969c077f81 admin home stats and information 2013-11-04 16:15:48 +01:00
Manuel Raynaud
6d1576faf8 test if request is an active scope in tra nslator 2013-11-04 14:47:18 +01:00
touffies
2e21713d40 Merge branch 'master' into frontend 2013-11-04 10:10:22 +01:00
Manuel Raynaud
b65044c1be Merge branch 'master' of github.com:thelia/thelia 2013-11-04 09:28:36 +01:00
Manuel Raynaud
d7012af3e2 add translation files for thelia core system 2013-11-04 09:28:12 +01:00
Franck Allimant
f3cba323c6 Changed 'template' loop into 'product-template' loop 2013-11-02 19:18:19 +01:00
Franck Allimant
069b047801 Added size limitation to the Thelia log file 2013-11-01 16:45:25 +01:00
Franck Allimant
2aefb87db7 Finished log configuration. All loggers are currentrly working 2013-11-01 16:15:19 +01:00
Franck Allimant
3368590a86 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-31 16:46:20 +01:00
Franck Allimant
a0855cda4c Added System Log configuration routes 2013-10-31 16:46:04 +01:00
Etienne Roudeix
95be087b90 review jqplot 2013-10-31 16:09:31 +01:00