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

2144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Etienne Roudeix
cf67a0478e Merge branch 'master' into tax 2013-10-23 16:32:10 +02:00
Etienne Roudeix
fb8b82093a administrators management 2013-10-23 16:31:37 +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
Manuel Raynaud
3dd51d98b6 process default behacior for languages 2013-10-23 15:41:41 +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
Manuel Raynaud
5542d8c494 create lang defaultBehavior form 2013-10-23 15:03:23 +02:00
Manuel Raynaud
53e25ce7c1 process delete language 2013-10-23 12:38:33 +02:00
Manuel Raynaud
b16edfbd1d create language delete event object 2013-10-23 12:38:32 +02:00
Manuel Raynaud
24b504ad3b finish language creation process 2013-10-23 12:38:32 +02:00
Manuel Raynaud
f881edbaa6 create toggleDefault method in lang method and modify in Country model 2013-10-23 12:38:32 +02:00
Manuel Raynaud
eac2c274e7 change http code status on different context 2013-10-23 12:38:32 +02:00
Manuel Raynaud
d356974ef7 create lang toggleDefault object 2013-10-23 12:38:32 +02:00
Manuel Raynaud
38761a7275 process lang udate action 2013-10-23 12:38:32 +02:00
Manuel Raynaud
a2d292f6a3 create lang object events 2013-10-23 12:38:32 +02:00
Manuel Raynaud
7915552fe6 create ajax modal for lang edition 2013-10-23 12:38:32 +02:00
Manuel Raynaud
c15431a468 create languages pages 2013-10-23 12:38:32 +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
Etienne Roudeix
3c69e38a3b Merge branch 'tax' 2013-10-23 08:49:24 +02:00
Etienne Roudeix
fb66f5a021 fix insert 2013-10-23 08:48:59 +02:00
Manuel Raynaud
e824907854 Merge pull request #48 from thelia/coupon 
Coupon
 2013-10-22 23:30:17 -07: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
gmorel
52e471ab1b Working adding decrementation when coupon is consumed 2013-10-22 23:04:08 +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
Etienne Roudeix
29d4ecbe35 Merge branch 'master' into tax 2013-10-22 20:20:40 +02:00
Etienne Roudeix
dba4a129ff module access management 2013-10-22 20:20:15 +02:00
Etienne Roudeix
44a5909c81 permission resource 2013-10-22 19:51:01 +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
Manuel Raynaud
2d987473b4 Merge branch 'master' of github.com:thelia/thelia 2013-10-22 17:20:18 +02:00
Manuel Raynaud
0580539ed8 fix cart quantity for issue #46 2013-10-22 17:19:16 +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