Commit Graph

47 Commits

Author SHA1 Message Date
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
Manuel Raynaud
50a5fd166b create smarty attribute for cart 2013-09-13 15:17:43 +02:00
Manuel Raynaud
b03eb969ca add logo for beta version 2013-09-11 16:18:58 +02:00
Manuel Raynaud
c1edc0e4ff update phpdebugbar dependency 2013-09-11 15:48:55 +02:00
Manuel Raynaud
8fa3ed287b Merge branch 'master' of github.com:thelia/thelia 2013-09-11 08:16:39 +02:00
Manuel Raynaud
fe8680ed76 refactor debugBar plugin 2013-09-10 22:15:55 +02:00
Manuel Raynaud
66d6f86b9a replace <i> tag by <span> for displaying icons 2013-09-10 17:07:20 +02:00
Manuel Raynaud
5ab3d4fb88 replace smarty variable identifier by $ 2013-09-10 16:54:13 +02:00
Manuel Raynaud
71928ec879 change link for homepage 2013-09-10 08:14:07 +02:00
Manuel Raynaud
f5e7467c86 start creating register and login pages 2013-09-09 21:40:58 +02:00
Manuel Raynaud
1bf2d02477 display good currency in template 2013-09-09 21:17:01 +02:00
Manuel Raynaud
bf46a937c0 defin currency at runtime 2013-09-09 21:00:28 +02:00
Manuel Raynaud
82602622e3 creating index page 2013-09-09 19:23:35 +02:00
Manuel Raynaud
02d758ae9a start integration default template 2013-09-09 17:30:18 +02:00