Commit Graph

63 Commits

Author SHA1 Message Date
touffies
23cd90b63f Platform was misspelled 2013-11-04 16:39:29 +01:00
touffies
65a8953143 Profile and Useful was misspelled
Add missing language key into the dictionary
2013-11-04 16:35:01 +01:00
touffies
dde764e672 Add favicon 2013-10-29 11:26:59 +01:00
Manuel Raynaud
51cd9f4ee8 Merge branch 'master' into frontend
Conflicts:
	templates/default/layout.tpl
2013-10-25 14:51:34 +02:00
touffies
a35ae5c42e Add GNU General Public License 2013-10-25 14:41:04 +02:00
Manuel Raynaud
4b157b30eb move shim in head part 2013-10-25 14:07:23 +02:00
touffies
ede3d95fad CSS3 Media Queries for IE8 2013-10-25 13:43:18 +02:00
Manuel Raynaud
ade22f5928 Merge pull request #77 from thelia/frontend
Car url should be on lowercase
2013-10-25 03:33:20 -07:00
touffies
1cee17732a CSS3 Media Queries for IE8 2013-10-25 12:30:49 +02:00
touffies
7bcbab6918 Remove "Christophe Laffont" 2013-10-25 12:20:41 +02:00
touffies
603fdfb9a3 Car url should be on lowercase 2013-10-25 12:03:23 +02:00
Manuel Raynaud
804b8599b1 Merge pull request #74 from thelia/frontend
Frontend
2013-10-25 02:54:51 -07:00
touffies
d25e536b8d Change contact email address 2013-10-25 11:50:17 +02:00
touffies
1e0599438a Change contact address 2013-10-25 11:48:57 +02:00
Manuel Raynaud
4a6745fef4 change link for changing language and currency in front office 2013-10-25 11:38:22 +02:00
touffies
84032af8aa Copyright date dynamic 2013-10-25 10:00:35 +02:00
touffies
54eda797a2 Replace /login and /register by /logout and /account in the footer if the customer is logged in 2013-10-24 19:56:15 +02:00
touffies
ebec82d1d2 Merge with master 2013-10-24 16:52:03 +02:00
touffies
b3c956880f Add jquery validation 2013-10-23 16:50:14 +02:00
touffies
ac70075a38 Newsletter subscription with ajax 2013-10-22 22:26:33 +02:00
Etienne Roudeix
0d242a4fc0 fix auth loop on index 2013-10-22 16:53:40 +02:00
touffies
8f48a56774 Contact page integration 2013-10-22 15:30:14 +02:00
touffies
9d5aa5e077 Merge branch 'master' into frontend
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
2013-10-22 11:55:58 +02:00
Manuel Raynaud
cc4f4f0bbe create newsletter template 2013-10-22 10:49:30 +02:00
touffies
0c1ed8e702 Cleanup :
- I made the form id different between the front and the back office
- I renamed a few files to use the same convention (create / update)
2013-10-22 09:44:45 +02:00
touffies
b21f7efc73 Remove debug bar 2013-10-18 15:59:08 +02:00
touffies
d204a32c09 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-18 12:43:27 +02:00
badsuricate
67ca9bfeec Footer :
Static to dynamic content
2013-10-18 10:54:34 +02:00
touffies
9d23ce87ac add nocache fot the mini-cart and login/logout 2013-10-16 15:14:23 +02:00
badsuricate
6ffeb2053c Include "include/mini-cart.html" 2013-10-16 09:45:53 +02:00
touffies
2cce95658f Add mini login form in the main navigation 2013-10-10 16:07:03 +02:00
touffies
11e0091c0b Text : correction search title 2013-10-09 12:58:16 +02:00
touffies
778fa9e4b5 Change integration - Add mini cart 2013-10-09 12:31:40 +02:00
touffies
7234b2e994 Merge master 2013-10-09 12:26:10 +02:00
Manuel Raynaud
d866ffaaf5 escape view parameter 2013-10-09 09:05:48 +02:00
touffies
fe5b72202c Add Bootbox.js (Extend the Bootstrap dialog for confirm and alert) 2013-10-07 11:45:03 +02:00
touffies
35b1ed6c04 Optimisation : Use only one file for bootstrap 2013-10-07 10:15:06 +02:00
Manuel Raynaud
666b19a6ff update address process 2013-10-04 17:33:48 +02:00
touffies
98e189390d Breadcrumbs completed 2013-10-02 17:58:39 +02:00
touffies
c56a7851e1 Merge with master (Conflict) 2013-10-02 11:26:11 +02:00
touffies
fd881b23f0 Merge with master 2013-10-02 11:20:48 +02:00
touffies
1cd82159b0 Modification of the breadcrumb 2013-10-02 11:00:28 +02:00
touffies
74c8de724f Creation of a new file breadcrumb.tpl 2013-10-01 15:20:40 +02:00
touffies
988fe23b78 Add a new block : body-class 2013-10-01 11:53:19 +02:00
Manuel Raynaud
a8a8ecb38c refactor product events, moving to Prduct folder 2013-09-25 17:50:29 +02:00
Manuel Raynaud
bf11fa1958 re-add home link in menu 2013-09-20 16:56:23 +02:00
Manuel Raynaud
44d6bbdb4a comment dev menu in layout 2013-09-20 16:48:37 +02:00
Manuel Raynaud
2cf71f99a9 change some informations in layou 2013-09-20 14:38:11 +02:00
Etienne Roudeix
8d20316217 no-return-functions block 2013-09-17 14:59:40 +02:00
Etienne Roudeix
c4fd65e6ea delivery process 2013-09-17 12:38:23 +02:00