Manuel Raynaud
|
b3d3d61602
|
add REF to product_sale_element loop and fix product tempalte
|
2013-11-27 10:07:58 +01:00 |
|
Manuel Raynaud
|
31ec431673
|
Merge pull request #111 from thelia/frontend
Frontend
|
2013-11-25 03:04:31 -08:00 |
|
Franck Allimant
|
c587cc3813
|
Fixed double '/' in generated assets URLs
|
2013-11-25 11:37:52 +01:00 |
|
touffies
|
fd0301022d
|
Merge branch 'backoffice' into frontend
|
2013-11-25 10:24:29 +01:00 |
|
touffies
|
743f894a4c
|
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
|
2013-11-25 10:20:15 +01:00 |
|
touffies
|
29ae2d26fe
|
Add a new admin page to manage the basic store configurations
|
2013-11-22 17:38:21 +01:00 |
|
Manuel Raynaud
|
a85baf6994
|
remove specific code testing esi integration
|
2013-11-22 09:43:24 +01:00 |
|
Manuel Raynaud
|
4109de0d9c
|
create smarty tag for smarty renderer
|
2013-11-20 14:45:40 +01:00 |
|
Manuel Raynaud
|
b9f7837686
|
remove Thelia ResponseListener
|
2013-11-20 14:45:40 +01:00 |
|
Manuel Raynaud
|
a436adf438
|
add new route for testing esi tag
|
2013-11-20 14:45:40 +01:00 |
|
Manuel Raynaud
|
64c5991838
|
tweak httpFoundation cache part for compatibility with
Thelia\HttpFoundation part
|
2013-11-20 14:45:40 +01:00 |
|
Manuel Raynaud
|
16af55ae77
|
start using symfony 2 reverse proxy
|
2013-11-20 14:43:14 +01:00 |
|
badsuricate
|
21c29f453f
|
Merge branch 'frontend' of github.com:thelia/thelia into frontend
|
2013-11-19 14:48:17 +01:00 |
|
badsuricate
|
bba78020fc
|
Add argument Title on Content Loop & Folder Loop
|
2013-11-19 14:44:00 +01:00 |
|
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
|
d1b897a254
|
Merge branch 'master' into frontend
Conflicts:
core/lib/Thelia/Controller/Admin/OrderController.php
|
2013-11-12 11:20:46 +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 |
|