Rafael Schouten 77e354f9f6 Merge branch 'master' into wys

2014-10-03 16:47:11 +10:00

..

assets

move text angular files

2014-10-03 16:43:56 +10:00

controllers

Product controller loads correct data for create and update actions

2014-10-02 12:32:26 +10:00

helpers

sanitize long_description html before injection

2014-10-03 16:06:04 +10:00

mailers

fix typos and add missing helper

2014-09-16 16:10:48 +10:00

models

Ignoring enterprise ownership before_validations when no owner set

2014-10-01 11:49:46 +10:00

overrides

configure textAngular on enterprise edit page

2014-09-30 18:20:45 +10:00

presenters

Simplify exchange products/variants JSON output format, bind angular to this

2013-01-10 10:59:53 +11:00

serializers

configure textAngular on enterprise edit page

2014-09-30 18:20:45 +10:00

views

Merge branch 'master' into wys

2014-10-03 16:47:11 +10:00