Franck Allimant
|
3e4bc0378c
|
Fixxed assets URLs (on Windows, DS is \ !)
|
2013-12-02 18:07:11 +01:00 |
|
Etienne Roudeix
|
9b165483d9
|
fix tax engine instance
|
2013-12-02 13:16:14 +01:00 |
|
Etienne Roudeix
|
fcde523b73
|
we are moving forward : no more "make it magic"
|
2013-11-28 17:12:33 +01:00 |
|
Etienne Roudeix
|
81fa5a291c
|
fix tax rules issue
|
2013-11-28 15:31:09 +01:00 |
|
Etienne Roudeix
|
bc9da10d8c
|
change asset origin param name by source
|
2013-11-28 12:02:53 +01:00 |
|
Etienne Roudeix
|
247ed6aa2a
|
Merge branch 'master' into modules
Conflicts:
core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
|
2013-11-28 10:34:57 +01:00 |
|
Franck Allimant
|
33e0a854f2
|
Implemented mail messages templates and layouts
|
2013-11-27 21:21:07 +01:00 |
|
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 |
|
Etienne Roudeix
|
7fd7458a2d
|
assets
|
2013-11-25 11:41:59 +01:00 |
|
Franck Allimant
|
c587cc3813
|
Fixed double '/' in generated assets URLs
|
2013-11-25 11:37:52 +01:00 |
|
touffies
|
a33a4cc963
|
Add validation for Store configuration
|
2013-11-25 11:22:38 +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 |
|
Etienne Roudeix
|
b9790efeee
|
Merge branch 'master' into modules
|
2013-11-25 10:05:01 +01:00 |
|
Etienne Roudeix
|
2bc1bbed64
|
asset tests
|
2013-11-25 10:03:48 +01:00 |
|
touffies
|
4ef7bd4c38
|
Call the wrong AdminResources in saveAction
|
2013-11-22 17:42:09 +01:00 |
|
touffies
|
85d9c112d3
|
Replace company_name and contact_email by store_name & store_email
|
2013-11-22 17:40:04 +01:00 |
|
touffies
|
29ae2d26fe
|
Add a new admin page to manage the basic store configurations
|
2013-11-22 17:38:21 +01:00 |
|
touffies
|
530188fbe7
|
Add routing for Store Configuration
|
2013-11-22 17:35:06 +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 |
|
David Rimbault
|
4b2a73c85d
|
Added some translations in the Customer Creation Form
|
2013-11-19 23:50:23 +01:00 |
|
Franck Allimant
|
46d95664a0
|
Fixed typo
|
2013-11-19 15:35:15 +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 |
|
Manuel Raynaud
|
8b8e4f7b14
|
remove unused config
|
2013-11-18 10:51:46 +01:00 |
|
Manuel Raynaud
|
12ac005674
|
remove unused form
|
2013-11-18 10:51:46 +01:00 |
|
OpenStudio
|
89e0bf8867
|
move front controller classes to Front module
|
2013-11-18 10:51:46 +01:00 |
|
Manuel Raynaud
|
597da57252
|
start Front module
|
2013-11-18 10:51:46 +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
|
608b9159ce
|
Merge branch 'modules'
|
2013-11-15 12:19:41 +01:00 |
|
Etienne Roudeix
|
87b25b922e
|
configure button in module page
|
2013-11-15 12:19:06 +01:00 |
|
Manuel Raynaud
|
0e74337a7b
|
fix class name in module generation
|
2013-11-15 11:49:51 +01:00 |
|
Etienne Roudeix
|
79120528b5
|
fix unit tests search by id in loop bug
due to not visible first entry in database
|
2013-11-14 14:17:47 +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
|
fa127ed4f0
|
colissimo module
|
2013-11-14 11:53:29 +01:00 |
|
Etienne Roudeix
|
48409c29a9
|
Colissimo in progress
|
2013-11-14 11:21:34 +01:00 |
|
Etienne Roudeix
|
299b192018
|
Colissimo module + countires areas
|
2013-11-14 09:13:28 +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 |
|
Manuel Raynaud
|
a276fe11a6
|
fix typo
|
2013-11-13 15:15:53 +01:00 |
|
Manuel Raynaud
|
b965275425
|
check extensions in install process
|
2013-11-13 15:14:06 +01:00 |
|