Franck Allimant
|
85ea937570
|
Optimisation of THELIA_* constants usage
|
2013-11-08 11:22:26 +01:00 |
|
Franck Allimant
|
d2a9de682d
|
Fixed file list bug
|
2013-11-07 14:57:18 +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 |
|
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
|
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 |
|
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 |
|
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
|
2aefb87db7
|
Finished log configuration. All loggers are currentrly working
|
2013-11-01 16:15:19 +01:00 |
|
Manuel Raynaud
|
af5d28ac6e
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-31 14:09:41 +01:00 |
|
Manuel Raynaud
|
696d67805d
|
finish to implement translation
|
2013-10-31 12:43:29 +01:00 |
|
Franck Allimant
|
3b9f94cec8
|
Using now templates instead of hard code in AdminUtilities smarty plugin
|
2013-10-31 12:16:14 +01:00 |
|
Manuel Raynaud
|
453575eeae
|
create compiler for loading translation.loader tag
|
2013-10-31 11:48:18 +01:00 |
|
Franck Allimant
|
a295fee0d3
|
Changed ModulesAdmin dir into AdminIncludes - Updated debug bar module
|
2013-10-31 11:36:56 +01:00 |
|
Manuel Raynaud
|
1ce6dfe04d
|
explode master config file. Now each xml file file presents in master
config is parse
|
2013-10-31 11:21:26 +01:00 |
|
Manuel Raynaud
|
8abe56458f
|
retrieve local from session in translator
|
2013-10-31 10:02:13 +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
|
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 |
|
Manuel Raynaud
|
eae231148e
|
Merge branch 'admin'
Conflicts:
core/lib/Thelia/Command/AdminUpdatePasswordCommand.php
core/lib/Thelia/Core/Event/Administrator/AdministratorUpdatePasswordEvent.php
|
2013-10-30 15:37:33 +01:00 |
|
Manuel Raynaud
|
78cba61cd5
|
finish admin update password command line
|
2013-10-30 15:35:11 +01:00 |
|
Manuel Raynaud
|
66c30a1b4c
|
start creating admin password recovery
|
2013-10-30 15:35:11 +01:00 |
|
Manuel Raynaud
|
7caa0a10e6
|
create administrator update password event
|
2013-10-30 15:35:11 +01:00 |
|
Manuel Raynaud
|
e18c8992f8
|
finish admin update password command line
|
2013-10-30 15:33:25 +01:00 |
|
Manuel Raynaud
|
b0f3ad69d2
|
start creating admin password recovery
|
2013-10-30 15:01:18 +01:00 |
|
Manuel Raynaud
|
2ee90d35e4
|
create administrator update password event
|
2013-10-30 14:27:45 +01:00 |
|
Etienne Roudeix
|
457c0460cf
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-30 12:28:30 +01:00 |
|