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

Browse Source

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

# By Manuel Raynaud (10) and others
# Via Manuel Raynaud (3) and others
* 'master' of https://github.com/thelia/thelia: (27 commits)
  AttributesAv management
  update cart model
  Using "update" instead of "change"
  Finished admin controllers refactoriing
  Created AbstractCrudController, and refactored existing controllers
  Continuer attributes management
  Change script file declaration order for bootstrap-editable fix
  Delete form on the orders view
  translate error message
  - Creation of order-edit view
  valid customer removal
  pse ref in faker
  pse ref
  loop tests
  test product loop limit
  update customer general info
  fix tests
  product loop test
  remove not needed flag in customer part
  change method to retrieve data in customer create process
  ...

...

This commit is contained in:

gmorel

2013-09-12 15:54:32 +02:00

parent 34609b19c2 b9338a7717

commit cee49c908d

94 changed files with 5006 additions and 1443 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

tests/functionnal/casperjs/pictures/screenshot-category-rule.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 582 B