Commit Graph

181 Commits

Author SHA1 Message Date
touffies
7695c19b40 Login action :
* Add account
* If user has checked "I'm a new customer", we must verify if it's a new email address.
2013-10-14 12:25:12 +02:00
touffies
d58f63990a Remove path.less in thelia's folder 2013-10-10 16:41:50 +02:00
touffies
3092c260b1 Remove alert 2013-10-10 16:40:44 +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
Manuel Raynaud
a7a663ebb8 select default country in front register form 2013-10-08 10:56:22 +02:00
touffies
fe5b72202c Add Bootbox.js (Extend the Bootstrap dialog for confirm and alert) 2013-10-07 11:45:03 +02:00
touffies
d6e09b4840 Optimization : User only 1 file for Bootstrap js 2013-10-07 11:43:59 +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
969071f7f2 Cleanup : remove plugin magnify 2013-10-04 09:11:16 +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
d37e28af19 rename order* file template 2013-09-30 11:12:15 +02:00
Manuel Raynaud
7bf5ee31c9 Merge branch 'refactor_action'
Conflicts:
	core/lib/Thelia/Action/Product.php
	core/lib/Thelia/Controller/Admin/CategoryController.php
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Controller/Admin/TemplateController.php
2013-09-30 10:26:59 +02:00
Etienne Roudeix
f9bffe9025 fix template 2013-09-27 15:23:35 +02:00
Etienne Roudeix
f60670c412 translations intl 2013-09-27 11:04:14 +02:00
Manuel Raynaud
a8a8ecb38c refactor product events, moving to Prduct folder 2013-09-25 17:50:29 +02:00
Manuel Raynaud
9c80120383 fix missing } in password template 2013-09-25 08:01:27 +02:00
Manuel Raynaud
bf11fa1958 re-add home link in menu 2013-09-20 16:56:23 +02:00
Manuel Raynaud
defaadcd62 Merge branch 'master' of github.com:thelia/thelia 2013-09-20 16:50:03 +02:00
Manuel Raynaud
44d6bbdb4a comment dev menu in layout 2013-09-20 16:48:37 +02:00
Etienne Roudeix
c05496af53 Merge branch 'master' into template 2013-09-20 16:32:42 +02:00
Manuel Raynaud
1a962d701d translate some missing string 2013-09-20 16:31:25 +02:00
Etienne Roudeix
61191b9d32 fixes order integration 2013-09-20 16:31:19 +02:00
Etienne Roudeix
8541499302 order process 2013-09-20 16:25:46 +02:00
Manuel Raynaud
4e6aac8917 Merge branch 'integration' 2013-09-20 14:39:00 +02:00
Manuel Raynaud
30d02799b2 Merge branch 'master' of github.com:thelia/thelia 2013-09-20 14:38:46 +02:00
Manuel Raynaud
2cf71f99a9 change some informations in layou 2013-09-20 14:38:11 +02:00
Manuel Raynaud
bb40086e2a allow to order products on category page 2013-09-20 13:59:51 +02:00
Manuel Raynaud
16de9bbcc9 allow displaying how much product wanted in category page 2013-09-20 09:19:12 +02:00
Manuel Raynaud
c255548d9b create dedicated file for menu 2013-09-20 08:45:38 +02:00
Manuel Raynaud
acffa60e50 awesome menu created in front office 2013-09-20 08:05:44 +02:00
Manuel Raynaud
24f17bcb0f fix count child on folder and category folder. Doubitch 2013-09-19 20:24:33 +02:00
Manuel Raynaud
e1353a63a7 complete meta tag for product part 2013-09-19 19:05:56 +02:00
Manuel Raynaud
a7a755fab5 add isbn meta tag 2013-09-19 18:58:43 +02:00
Manuel Raynaud
a540626fff fix product import 2013-09-19 18:47:12 +02:00
Manuel Raynaud
1f5cd1da62 create category template 2013-09-19 17:48:01 +02:00
Manuel Raynaud
af532ea271 change link to home page in front template 2013-09-19 16:45:38 +02:00
Manuel Raynaud
cb20f5e38b add block more info in product template 2013-09-19 16:33:34 +02:00
Etienne Roudeix
4ac9a0afad Merge branch 'master' of github.com:thelia/thelia 2013-09-19 16:24:05 +02:00
Manuel Raynaud
41bd8a7cec icomplete product page 2013-09-19 15:39:36 +02:00
Etienne Roudeix
3c02a9d23c Merge branch 'master' of github.com:thelia/thelia 2013-09-19 15:12:37 +02:00