Commit Graph

1992 Commits

Author SHA1 Message Date
badsuricate
b26c3216c5 Fix 404 error page 2013-10-23 23:25:41 +02:00
badsuricate
4660992d75 Add good product combination to the cart 2013-10-23 17:26:11 +02:00
badsuricate
c6a11f44c0 add class cart-container 2013-10-23 17:25:22 +02:00
badsuricate
1d75e6a4ad CHange input type hidden to input type integer 2013-10-23 17:25:03 +02:00
badsuricate
62c64444a3 Delete console.log 2013-10-23 16:55:39 +02:00
badsuricate
6fb6cc9679 Merge frontend 2013-10-23 16:47:24 +02:00
badsuricate
5515caa0d5 Internationalizing "No products available in this category" 2013-10-23 15:48:06 +02:00
badsuricate
dffb5375f5 Check if hasbtn is true to display the button "add to cart " 2013-10-23 15:45:00 +02:00
badsuricate
b8c433f92c reorganize the menu to display the number of products by categories 2013-10-23 15:43:46 +02:00
badsuricate
e35d17346d Add CSS to align "Upsell Products" 2013-10-23 15:41:40 +02:00
badsuricate
41713d68be add css for modal-box 2013-10-23 15:37:56 +02:00
badsuricate
77959afefa Add AJAX on "Add to Cart" buttons 2013-10-23 15:33:47 +02:00
badsuricate
5e62da9d29 Add new Arguments for CartLoop
New args = Limit and position
2013-10-23 15:20:42 +02:00
touffies
b6f9624544 Add a generic route (default) to manage the simple path 2013-10-23 11:49:36 +02:00
badsuricate
7d5803a541 Add routes for mini-cart and addedToCart 2013-10-23 11:47:42 +02:00
touffies
a91303a27d Add new method updatePasswordAction (Not finished) 2013-10-23 00:07:27 +02:00
touffies
5dc33aec4d Remove duplicate class "panel" 2013-10-22 23:45:56 +02:00
touffies
c48c7b5486 issues/45 : Check if an input field has focus on the mini login form, if no we hide the form 2013-10-22 22:48:22 +02:00
touffies
ac70075a38 Newsletter subscription with ajax 2013-10-22 22:26:33 +02:00
touffies
f844080758 Align the navbar on the right
Add google map for the contact page
2013-10-22 18:17:53 +02:00
touffies
9c702e8d14 Integration : Add min height to the product tabs 2013-10-22 16:35:53 +02:00
touffies
aa842c510a Wrong class name on the carousel-control 2013-10-22 16:31:55 +02:00
touffies
13bb69e429 Remove validation_groups 2013-10-22 16:21:30 +02:00
touffies
0a4c3e2d6e Fix password forgotten route 2013-10-22 16:16:40 +02:00
touffies
a9dd13ae70 Oups... I forgot to rename CustomerCreation into CustomerCreateForm 2013-10-22 15:50:04 +02:00
touffies
8f48a56774 Contact page integration 2013-10-22 15:30:14 +02:00
badsuricate
11d1fa46f7 Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-22 12:03:06 +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
Etienne Roudeix
cb0619a7b3 Merge branch 'master' of github.com:thelia/thelia 2013-10-22 11:33:24 +02:00
Etienne Roudeix
77dbdce4e8 fix tests 2013-10-22 11:33:01 +02:00
Etienne Roudeix
42e8b3a596 fix tests 2013-10-22 11:24:33 +02:00
Manuel Raynaud
5755da1e8c change newsletter success message 2013-10-22 11:22:23 +02:00
Etienne Roudeix
7e32957d12 Merge branch 'master' into tax 2013-10-22 11:10:06 +02:00
Etienne Roudeix
b00f70fa24 permission management 2013-10-22 11:09:24 +02:00
Manuel Raynaud
47212490d2 verify if an email already exists in newsletter table 2013-10-22 10:58:16 +02:00
Manuel Raynaud
cc4f4f0bbe create newsletter template 2013-10-22 10:49:30 +02:00
badsuricate
dbcfd8965f Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-22 10:24:03 +02:00
touffies
945471dd8a Modify contact form name for the front 2013-10-22 10:20:21 +02:00
touffies
e9c6f403a3 Merge branch 'master' into frontend 2013-10-22 10:17:47 +02:00
Manuel Raynaud
c9074892b2 complete controller and newsletter listener 2013-10-22 10:01:02 +02:00
Manuel Raynaud
888c2c6ab9 create routes for newsletter management 2013-10-22 09:54:44 +02:00
Manuel Raynaud
30f0973481 complete newsletter controller 2013-10-22 09:51:42 +02:00
Manuel Raynaud
f6fb778c3e create newsletter listener 2013-10-22 09:48:24 +02:00
Manuel Raynaud
f52a0f3652 create event message for newsletter subsribe action 2013-10-22 09:46:38 +02:00
Manuel Raynaud
6b8c7602b4 create newsletter event 2013-10-22 09:45:37 +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
Manuel Raynaud
aabd05f17f create form and controller for newsletter 2013-10-22 09:42:57 +02:00
Manuel Raynaud
f4c4cea32b create newsletter entity 2013-10-22 09:36:52 +02:00
touffies
b64dedefc6 Add new page to modify the customer password 2013-10-22 09:27:33 +02:00
Manuel Raynaud
f70c5362e9 fix typo 2013-10-22 09:13:21 +02:00