TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,159 Commits 1 Branch 0 Tags
a0cfead4b0aa660df0298cbcfe47623a3dd2099a
Commit Graph

299 Commits

Author SHA1 Message Date
Manuel Raynaud
a0cfead4b0 display status label instead of id status in account page 2013-10-25 12:14:46 +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
touffies
f83d12f2aa Center vertical Cart and Mini Cart 2013-10-25 11:41:34 +02:00
Manuel Raynaud
4a6745fef4 change link for changing language and currency in front office 2013-10-25 11:38:22 +02:00
touffies
8fe2955726 Remove margin bottom on the Quantity dropdown 2013-10-25 11:37:28 +02:00
touffies
64260d7429 Hide the label for the coupon code 2013-10-25 11:33:33 +02:00
Manuel Raynaud
e2a7bbe1c0 fix typo 2013-10-25 11:32:51 +02:00
touffies
0de3245eb6 Check by default the first delivery method and check by default the default delivery address 2013-10-25 11:28:54 +02:00
Manuel Raynaud
f8a688fb03 change syntax for displaying date in templates 2013-10-25 11:28:17 +02:00
touffies
166407844b Fix semantic on the delivery method list 2013-10-25 11:10:27 +02:00
touffies
b7dc345edd Add default label for the delivery address 2013-10-25 11:03:52 +02:00
touffies
157f97467a Replace button checkout with link into mini-cart 2013-10-25 11:00:25 +02:00
touffies
1b3b470b60 Change color of an active thumbnail 2013-10-25 10:11:04 +02:00
touffies
84032af8aa Copyright date dynamic 2013-10-25 10:00:35 +02:00
Manuel Raynaud
a85c0a75cf Merge pull request #55 from thelia/frontend 
Frontend
 2013-10-24 12:31:42 -07: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
d8b2ef28fc Issue 51, removed s at account information 2013-10-24 19:45:30 +02:00
Manuel Raynaud
9965b6a7a7 remove link on product images in invoice page 2013-10-24 17:52:06 +02:00
Manuel Raynaud
9cd986d3b6 fix issue #53 2013-10-24 17:33:35 +02:00
touffies
ebec82d1d2 Merge with master 2013-10-24 16:52:03 +02:00
badsuricate
e0a927daf1 Add 404 Page 2013-10-24 15:31:12 +02:00
touffies
ac3e842662 All the fields should be with the type password. 2013-10-24 00:11:30 +02:00
touffies
2defbb3b6c Remove temporary the filter 2013-10-23 18:14:40 +02:00
touffies
21286c2094 Bug : Minimum quantity is 1 2013-10-23 17:49:51 +02:00
touffies
f7f7444fcb Modification of "Continue Shopping" button 2013-10-23 17:47:04 +02:00
touffies
0c4592a9dd Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-23 17:27:52 +02:00
touffies
cb560691eb Fix login box 2013-10-23 17:27: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
62c64444a3 Delete console.log 2013-10-23 16:55:39 +02:00
touffies
8c55675dd8 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-23 16:51:30 +02:00
touffies
3f69abc16c Bug : Remove double quote 2013-10-23 16:51:20 +02:00
touffies
b3c956880f Add jquery validation 2013-10-23 16:50:14 +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
touffies
5dc33aec4d Remove duplicate class "panel" 2013-10-22 23:45:56 +02:00
gmorel
b45fbef2ad Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia: (33 commits)
  permissions
  finish contact process
  create contact form
  create example for mail usage
  permission cleanup
  change place where absolute url is create when rewritten url is enabled
  fix issue #43
  fix typo in product breadcrumb
  update countries list
  fix issue #35
  fix cartItem updateQuantity method
  add some verification on country default trigger
  not allowed to delete default country
  WIP : admin profiles
  fiw test suite
  clear cache when a module is removed
  end module removal
  create event object for module delete action
  update insert script
  new model
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
 2013-10-22 23:01:04 +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
Etienne Roudeix
0d242a4fc0 fix auth loop on index 2013-10-22 16:53:40 +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