Commit Graph

237 Commits

Author SHA1 Message Date
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
Etienne Roudeix
0d242a4fc0 fix auth loop on index 2013-10-22 16:53:40 +02:00
Etienne Roudeix
cb0619a7b3 Merge branch 'master' of github.com:thelia/thelia 2013-10-22 11:33:24 +02:00
Manuel Raynaud
5755da1e8c change newsletter success message 2013-10-22 11:22:23 +02:00
Etienne Roudeix
b00f70fa24 permission management 2013-10-22 11:09:24 +02:00
Manuel Raynaud
cc4f4f0bbe create newsletter template 2013-10-22 10:49:30 +02:00
gmorel
42aa46905b 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-21 22:49:32 +02:00
Manuel Raynaud
9ce90abdf5 finish contact process 2013-10-21 19:07:59 +02:00
Manuel Raynaud
c0781455cb create contact form 2013-10-21 18:33:03 +02:00
Manuel Raynaud
043eab7ccf fix typo in product breadcrumb 2013-10-21 14:28:03 +02:00
Manuel Raynaud
3dcb399d01 fix cartItem updateQuantity method 2013-10-21 12:21:33 +02:00
gmorel
ad69c45e4f Merge branch 'master' of https://github.com/thelia/thelia into coupon
* 'master' of https://github.com/thelia/thelia: (87 commits)
  Missing ajax-loader icon
  don't use alternative Logger in debugbar if debug is disabled
  Remove debug bar
  Move temporarily fontawesome's font into the web folder
  Add loader css
  fix product visibility comparaison parameter
  Change this page on public page
  Bug : Remove close tag </a>
  decode url before searching if it's a rewritten url
  Modification font-size of price elements
  add page View All
  Add button "add product to cart"
  Footer : Static to dynamic content
  Add order on attribute_combination loop
  Fix bug in Content Loop with "current_folder" params
  Creation of Content page
  Change path /customer/account into /account
  Change path :  /customer/update into /account/update  /password into /account/password
  CustomerUpdateForm - Extend CustomerCreation
  Update profile - new method [Not finished yet]
  ...
2013-10-20 21:11:58 +02:00
Manuel Raynaud
07a2944618 Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-18 16:51:50 +02:00
touffies
bba7b9bb76 Missing ajax-loader icon 2013-10-18 16:48:38 +02:00
Manuel Raynaud
d6e26e428e Merge branch 'master' into frontend
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	templates/admin/default/tax-rule-edit.html
	templates/admin/default/taxes-rules.html
2013-10-18 16:41:39 +02:00
touffies
1ee45e0cb2 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-18 16:00:14 +02:00
touffies
b21f7efc73 Remove debug bar 2013-10-18 15:59:08 +02:00
touffies
268e5355aa Add loader css 2013-10-18 15:46:32 +02:00
badsuricate
2257623c3b Change this page on public page 2013-10-18 14:49:47 +02:00
touffies
d204a32c09 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-18 12:43:27 +02:00
touffies
3fe1716bc4 Bug : Remove close tag </a> 2013-10-18 12:40:08 +02:00
badsuricate
e80b2157b1 Modification font-size of price elements 2013-10-18 11:04:42 +02:00
badsuricate
4b65675bef add page View All 2013-10-18 11:04:10 +02:00
badsuricate
cab914bb64 Add button "add product to cart" 2013-10-18 10:55:47 +02:00
badsuricate
67ca9bfeec Footer :
Static to dynamic content
2013-10-18 10:54:34 +02:00
badsuricate
85e9a26cb6 Add order on attribute_combination loop 2013-10-18 10:53:36 +02:00
badsuricate
3db29c9d1d Creation of Content page 2013-10-18 10:51:52 +02:00
touffies
19b1537cdc Change path /customer/account into /account 2013-10-18 10:00:39 +02:00
touffies
27d8646be0 Update profil page 2013-10-18 09:42:26 +02:00
touffies
4f8d43b569 Remove trailing slash 2013-10-18 09:40:31 +02:00
touffies
adc473a595 Change path to /account page 2013-10-18 09:19:47 +02:00
touffies
0375c2ec1d Add .group-newsletter 2013-10-18 09:15:45 +02:00
touffies
0875a491ce Warning message if the cart is empty 2013-10-18 09:14:11 +02:00
touffies
09f5fe8af7 Add a message if the cart is empty 2013-10-18 09:13:42 +02:00
touffies
dca2b37739 Change path. No need to add the customer Id in the path, we must use the customer id in the session. 2013-10-18 09:12:41 +02:00
touffies
2f033e1ffa Change path to /account 2013-10-18 09:08:35 +02:00
gmorel
cf78c7c5d5 Merge branch 'master' of https://github.com/thelia/thelia into coupon
* 'master' of https://github.com/thelia/thelia:
  theliatype in form : types now extends bastype which implement typeinterface basetype provides verifiyForm method wich can be call in Callback constraint
  restart thelia form type
  thelia type constraints
  tax management
  fix menu when child > 0
  taxes management
  tax rule edition
2013-10-17 01:38:35 +02:00
gmorel
d2851b1c93 WIP : Coupon implementation in front : Coupon : Fixing unit tests 2013-10-17 01:38:13 +02:00
touffies
c939d14e22 Display warning message if the user has no order 2013-10-16 16:57:25 +02:00
touffies
9d23ce87ac add nocache fot the mini-cart and login/logout 2013-10-16 15:14:23 +02:00
touffies
5fdebe4d2e Empty cart + Intl 2013-10-16 15:13:04 +02:00
touffies
fbebadaff0 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-16 12:47:52 +02:00
touffies
9469c1a0ec - Redirect to /customer/account on success
- Agreements are mandatory
2013-10-16 12:36:17 +02:00
Manuel Raynaud
b3c761798b fix menu when child > 0 2013-10-16 11:45:18 +02:00
touffies
da81575a61 Remove novalidate on the form element 2013-10-16 10:57:02 +02:00
touffies
d091359299 Fix HTML5 autofocus
- Focus Email if error of if value is null (Page load)
- Otherwise Focus password
2013-10-16 10:38:29 +02:00
badsuricate
8d15d161fb Creation of "include/mini-cart.html" 2013-10-16 09:51:48 +02:00
badsuricate
04bd135c94 Static content to dynamic content 2013-10-16 09:51:08 +02:00
badsuricate
6ffeb2053c Include "include/mini-cart.html" 2013-10-16 09:45:53 +02:00
badsuricate
ec4bf3d7bd Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-14 14:36:17 +02:00