Rohan Mitchell e951f80070 Merge branch 'new-product-form' ...

Conflicts:
	app/assets/javascripts/admin/admin.js.coffee

2014-05-24 17:14:32 +10:00

..

controllers

Merge branch 'new-product-form'

2014-05-24 17:14:32 +10:00

directives

Remove reference to 'Admin' from global namespace

2014-05-23 11:22:12 +10:00

filters

Remove reference to 'Admin' from global namespace

2014-05-23 11:22:12 +10:00

products

Simplify new product form

2014-05-23 18:08:29 +10:00

services

Merge branch 'new-product-form'

2014-05-24 17:14:32 +10:00

admin.js.coffee

Merge branch 'new-product-form'

2014-05-24 17:14:32 +10:00

all.js

Merge branch 'new-product-form'

2014-05-24 17:14:32 +10:00

bulk_order_management.js.coffee

Remove reference to 'Admin' from global namespace

2014-05-23 11:22:12 +10:00

bulk_product_update.js.coffee

Remove reference to 'Admin' from global namespace

2014-05-23 11:22:12 +10:00

dropdown.js.coffee

BOM interface cleanup

2014-04-06 19:22:17 +10:00

enterprise_fees.js

Enterprise fees admin page for a specific enterprise auto-selects that enterprise for new fees and only allows selection of managed enterprises

2013-10-30 17:00:05 +11:00

order_cycle.js.erb.coffee

Patching a test and removing our duped Angular libs

2014-04-08 18:09:02 +10:00

util.js.erb

Moving our fix for the broken Spree function into our own JS

2013-11-29 14:24:56 +11:00