Etienne Roudeix
|
8b8bae5bd7
|
fix module template inclusion
|
2013-11-15 16:51:13 +01:00 |
|
Etienne Roudeix
|
a4935a556c
|
fix modules bug
|
2013-11-15 16:35:29 +01:00 |
|
Etienne Roudeix
|
87b25b922e
|
configure button in module page
|
2013-11-15 12:19:06 +01:00 |
|
Etienne Roudeix
|
8cd32aa5dd
|
Merge branch 'modules'
|
2013-11-14 12:04:20 +01:00 |
|
Etienne Roudeix
|
ff57fe3a5c
|
colissimo module
|
2013-11-14 12:03:28 +01:00 |
|
Etienne Roudeix
|
48409c29a9
|
Colissimo in progress
|
2013-11-14 11:21:34 +01:00 |
|
Franck Allimant
|
d42e77d475
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-11-13 16:31:03 +01:00 |
|
Franck Allimant
|
29ab422438
|
Fixed typos
|
2013-11-13 16:30:43 +01:00 |
|
Manuel Raynaud
|
c5d6157cd5
|
change translation template baseDir
|
2013-11-13 16:27:36 +01:00 |
|
Etienne Roudeix
|
77760e7d3f
|
module template inclusion
|
2013-11-13 14:48:35 +01:00 |
|
Etienne Roudeix
|
25192cf366
|
change template subdirs
|
2013-11-13 10:24:14 +01:00 |
|
Manuel Raynaud
|
cbe5ba27cf
|
change developmentMode by debugMode in assetManager
|
2013-11-12 12:41:01 +01:00 |
|
touffies
|
297d906027
|
Merge branch 'master' into frontend
Conflicts:
core/lib/Thelia/Controller/Admin/OrderController.php
|
2013-11-12 11:09:55 +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
|
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 |
|
touffies
|
c235ad931a
|
Add order argument
|
2013-11-08 15:03:40 +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
|
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 |
|