Commit Graph

543 Commits

Author SHA1 Message Date
Franck Allimant
85ea937570 Optimisation of THELIA_* constants usage 2013-11-08 11:22:26 +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
touffies
eb1f509c67 Zipcode translation error on the french version 2013-11-07 12:19:27 +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
f8f68eb59b Fixed minor internationalizable string error in admin templates. 2013-11-06 20:01:26 +01:00
Franck Allimant
8d40605091 Continued on translations 2013-11-06 14:40:33 +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
Franck Allimant
361e4a9d74 Implementing translations (still in progress) 2013-11-06 10:49:03 +01:00
Manuel Raynaud
1ccd2e63ce Merge branch 'master' of github.com:thelia/thelia 2013-11-06 09:30:17 +01:00
Manuel Raynaud
7fdcce3c92 fix typo 2013-11-06 09:30:00 +01:00
Manuel Raynaud
833472e6eb complete french translation 2013-11-05 15:59:14 +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
Franck Allimant
f3cba323c6 Changed 'template' loop into 'product-template' loop 2013-11-02 19:18:19 +01:00
Franck Allimant
2aefb87db7 Finished log configuration. All loggers are currentrly working 2013-11-01 16:15:19 +01:00
Manuel Raynaud
c1cfc086a1 Merge branch 'master' of github.com:thelia/thelia 2013-10-31 16:52:21 +01:00
Etienne Roudeix
1bcec28841 remove tax js in profiles 2013-10-31 16:24:57 +01:00
Etienne Roudeix
26c7acbeaa admoin home stats navigation 2013-10-31 16:09:31 +01:00
Etienne Roudeix
95be087b90 review jqplot 2013-10-31 16:09:31 +01:00
Etienne Roudeix
689de106c7 admin home stats 2013-10-31 16:09:31 +01:00
Etienne Roudeix
bc454124f3 admin home stats 2013-10-31 16:09:31 +01:00
Manuel Raynaud
99dc559484 update translation files for admin part 2013-10-31 16:08:54 +01:00
Manuel Raynaud
5110abe207 create translation files for admin part 2013-10-31 15:46:36 +01:00
Etienne Roudeix
899a154350 Merge branch 'master' of github.com:thelia/thelia 2013-10-31 15:33:30 +01:00
Franck Allimant
3b9f94cec8 Using now templates instead of hard code in AdminUtilities smarty plugin 2013-10-31 12:16:14 +01:00
Etienne Roudeix
07c5dd4a51 admoin home stats navigation 2013-10-31 11:59:25 +01:00
Franck Allimant
a295fee0d3 Changed ModulesAdmin dir into AdminIncludes - Updated debug bar module 2013-10-31 11:36:56 +01:00
Etienne Roudeix
00dab8e7ec review jqplot 2013-10-31 11:20:51 +01:00
Etienne Roudeix
e5f5570d2b Merge branch 'master' of github.com:thelia/thelia 2013-10-31 11:20:42 +01:00
Franck Allimant
a06d83bfb4 Fixed exception if module content is empty 2013-10-30 20:10:37 +01:00
Franck Allimant
d1c54ea62a Merge branch 'catalog'
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
2013-10-30 19:55:10 +01:00
Franck Allimant
f5828dc18b added timestamp parameter to format_date sparty plugin 2013-10-30 19:52:47 +01:00
Franck Allimant
3019d36356 Minor adjustements 2013-10-30 17:31:02 +01:00
Etienne Roudeix
f90df03f7d admin home stats 2013-10-30 17:00:38 +01:00
Franck Allimant
c7835758e5 Minor css tuning, renamed "details" tab of categories edition to
associaitons
2013-10-30 16:32:36 +01:00
Etienne Roudeix
083dde5e93 admin home stats 2013-10-30 16:32:24 +01:00
Franck Allimant
9f11f475ee Typo 2013-10-30 15:47:21 +01:00
Franck Allimant
a11a013eb0 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-30 15:44:57 +01:00
Franck Allimant
0cabe7b9e8 Combination creation management 2013-10-30 15:44:32 +01:00
Etienne Roudeix
a540c50395 fix administrators management bug 2013-10-30 14:51:13 +01:00
Etienne Roudeix
e998717c9b remove not working datepicker in coupons 2013-10-30 12:02:50 +01:00
Etienne Roudeix
52fa6783f3 datepicker in admin logs 2013-10-30 12:00:48 +01:00
Etienne Roudeix
19e373f7fe Merge branch 'master' of github.com:thelia/thelia 2013-10-29 16:10:10 +01:00
Etienne Roudeix
a055f3b3eb admin log 2013-10-29 16:09:50 +01:00
Etienne Roudeix
082f9aff8d admin logs 2013-10-29 12:22:34 +01:00
Manuel Raynaud
7a2469cdc8 allow to create a customer in bakcoffice 2013-10-28 16:55:07 +01:00
Manuel Raynaud
1e65ad8cf3 add shim and respond in backoffice 2013-10-28 16:10:06 +01:00
Manuel Raynaud
1c3aeb969d select correct country in selectbox on customer edit page 2013-10-28 15:42:34 +01:00