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
|
b0371312e2
|
assets in modules
|
2013-11-28 11:47:21 +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 |
|
Etienne Roudeix
|
7e83896f96
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-11-28 10:30:28 +01:00 |
|
Etienne Roudeix
|
4c754376e7
|
assets in module
|
2013-11-28 10:30:08 +01:00 |
|
Manuel Raynaud
|
b3a3cb2e8f
|
Merge pull request #114 from thelia/email
Email
|
2013-11-27 12:25:21 -08:00 |
|
Manuel Raynaud
|
476e3062e5
|
fix typo
|
2013-11-27 21:21:07 +01:00 |
|
Franck Allimant
|
33e0a854f2
|
Implemented mail messages templates and layouts
|
2013-11-27 21:21:07 +01:00 |
|
touffies
|
e675be4cff
|
Email template + test email
|
2013-11-27 21:19:27 +01:00 |
|
Manuel Raynaud
|
1cd07603d3
|
Merge pull request #113 from Boyquotes/master
Correct link during the installation process and config url website
|
2013-11-27 01:10:10 -08:00 |
|
Manuel Raynaud
|
b3d3d61602
|
add REF to product_sale_element loop and fix product tempalte
|
2013-11-27 10:07:58 +01:00 |
|
Nicolas Villa
|
74b391efee
|
Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory
|
2013-11-26 18:09:48 +01:00 |
|
Nicolas Villa
|
657cd95f3b
|
Add correct url(subdiretory included) in config page
|
2013-11-26 18:09:23 +01:00 |
|
Nicolas Villa
|
05c723a9ac
|
Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory
|
2013-11-26 18:08:45 +01:00 |
|
Manuel Raynaud
|
e1bd2872d1
|
Merge pull request #112 from thelia/frontend
Check if store_country has a value
|
2013-11-25 06:37:16 -08:00 |
|
touffies
|
2549369b45
|
Check if store_country has a value
|
2013-11-25 14:42:18 +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
|
6b95d34f5a
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-11-25 10:04:44 +01:00 |
|
Etienne Roudeix
|
2bc1bbed64
|
asset tests
|
2013-11-25 10:03:48 +01:00 |
|
touffies
|
7f1c1bfdd8
|
Use Store contact information
|
2013-11-22 17:51:35 +01:00 |
|
touffies
|
4ef7bd4c38
|
Call the wrong AdminResources in saveAction
|
2013-11-22 17:42:09 +01:00 |
|
touffies
|
3df3379e70
|
Action buttons smaller
|
2013-11-22 17:40:56 +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
|
4e5daf8c9f
|
Merge pull request #110 from thelia/http_caching
Http caching
|
2013-11-22 01:18:01 -08:00 |
|
Manuel Raynaud
|
338a97c091
|
undo removing Response::prepare call
|
2013-11-22 10:04:14 +01:00 |
|
Manuel Raynaud
|
5d52a34f05
|
HttpCache can not be activated as default
|
2013-11-22 10:02:42 +01:00 |
|
Manuel Raynaud
|
a85baf6994
|
remove specific code testing esi integration
|
2013-11-22 09:43:24 +01:00 |
|
Manuel Raynaud
|
bdc49ade98
|
Merge branch 'http_caching' of github.com:thelia/thelia into http_caching
Conflicts:
core/lib/Thelia/Core/TheliaHttpKernel.php
|
2013-11-20 14:46:47 +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
|
6a80dde83b
|
add httpcache into index_dev.php file
|
2013-11-20 14:43:14 +01:00 |
|
Manuel Raynaud
|
16af55ae77
|
start using symfony 2 reverse proxy
|
2013-11-20 14:43:14 +01:00 |
|
Manuel Raynaud
|
5b2d9cd2da
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-11-20 14:42:20 +01:00 |
|
Manuel Raynaud
|
2d3d3fe283
|
update wiki url in composer file
|
2013-11-20 14:42:01 +01:00 |
|
Manuel Raynaud
|
a52873a731
|
create smarty tag for smarty renderer
|
2013-11-20 11:52:20 +01:00 |
|
Manuel Raynaud
|
cb1db1a63e
|
remove Thelia ResponseListener
|
2013-11-20 10:43:36 +01:00 |
|