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
|
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 |
|
Manuel Raynaud
|
48319eedde
|
add new route for testing esi tag
|
2013-11-20 10:09:12 +01:00 |
|
Manuel Raynaud
|
d9d9809db5
|
Merge pull request #109 from moustikAir/translations
Added some translations in the Customer Creation Form
|
2013-11-20 00:20:06 -08:00 |
|
David Rimbault
|
4b2a73c85d
|
Added some translations in the Customer Creation Form
|
2013-11-19 23:50:23 +01:00 |
|
Franck Allimant
|
9598082c00
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-11-19 15:35:35 +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
|
b8345fa30d
|
Merge branch 'master' into http_caching
Conflicts:
core/lib/Thelia/Core/TheliaHttpKernel.php
|
2013-11-19 14:26:29 +01:00 |
|
Manuel Raynaud
|
0c40248f06
|
Merge pull request #108 from thelia/frontend
Frontend
|
2013-11-19 01:37:41 -08:00 |
|
touffies
|
5b653cca32
|
Add warning message if there's no delivery method available
|
2013-11-19 09:30:35 +01:00 |
|
touffies
|
15ff5e422e
|
Optimisation slider image
|
2013-11-19 09:29:59 +01:00 |
|
Manuel Raynaud
|
d6bf64f7a6
|
change max weight in faker
|
2013-11-18 15:04:00 +01:00 |
|
Manuel Raynaud
|
a7d274b4c6
|
complete readme
|
2013-11-18 11:51:37 +01:00 |
|
Manuel Raynaud
|
2a3d55a63a
|
create changelog file
|
2013-11-18 11:40:31 +01:00 |
|
Manuel Raynaud
|
8d956f0c2c
|
Merge pull request #107 from thelia/front_refactor
Front part is now a module
|
2013-11-18 01:58:14 -08:00 |
|
Manuel Raynaud
|
7765198d67
|
Merge branch 'front_refactor' of github.com:thelia/thelia into front_refactor
|
2013-11-18 10:52:59 +01:00 |
|
Manuel Raynaud
|
b39f0fd936
|
Front module is activated by default
|
2013-11-18 10:51:46 +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 |
|
Manuel Raynaud
|
9446b33ee7
|
load custom router from Front module
|
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
|
26ab45b8b7
|
Merge pull request #105 from moustikAir/patch-1
Corrected the French translation of "Miss" in the Register form dropdown
|
2013-11-17 09:31:23 -08:00 |
|
David
|
54d5e98971
|
Corrected the French translation of "Miss" in the Register form dropdown
Corrected French translation of Miss from "Madamemoiselle" to "Mademoiselle"
|
2013-11-17 01:01:01 +01:00 |
|
Manuel Raynaud
|
dadf17e4ed
|
remove unused config
|
2013-11-15 17:37:07 +01:00 |
|
Manuel Raynaud
|
277d8bb091
|
remove unused form
|
2013-11-15 17:19:56 +01:00 |
|
Manuel Raynaud
|
38ec9864ca
|
load custom router from Front module
|
2013-11-15 17:08:54 +01:00 |
|