gmorel 3aa9c71e34 Merge branches 'coupon' and 'master' of https://github.com/thelia/thelia into coupon ...

* 'coupon' of https://github.com/thelia/thelia:

# By Etienne Roudeix (17) and others
# Via Etienne Roudeix (9) and others
* 'master' of https://github.com/thelia/thelia: (52 commits)
  fix content faker
  fix typo and remove url generation in postInsert model
  add covers annotation in ProductRewriteTest
  create test for UrlRewritingTrait
  payment loop
  fix postage display
  postage + invoice step
  template is not mandatory in product table.
  refactor rewrriten method name
  Changed getDefaultCategory in getDefaultCategoryId
  remove old model classes:
  Working : Content : fix loop giving no elements
  Working : Content : fix loop giving no elements
  Added missing files...
  Started product management
  Working : Content : fix loop giving no elements
  Working : Product : fix loop giving no elements
  cart billing integration
  empty cart or delivery exception
  remove isntall routing and template
  ...

2013-09-17 22:55:29 +02:00

..

lib/Thelia

Merge branches 'coupon' and 'master' of https://github.com/thelia/thelia into coupon

2013-09-17 22:55:29 +02:00

bootstrap.php

Product loop adjustements

2013-08-01 10:53:35 +02:00