Rafael Schouten f3fc70ebf0 Merge branch 'master' into raf_bugfix ...

Conflicts:
	app/assets/stylesheets/admin/openfoodnetwork.css.scss

2014-10-04 12:51:55 +10:00

..

controllers

Admin can create enterprise relationships with permissions

2014-08-25 14:59:10 +10:00

directives

WIP: angularised provider settings for payment method works on create (for admin only at this stage)

2014-08-08 17:47:50 +10:00

enterprises

refactor wysiwyg

2014-10-01 16:07:10 +10:00

filters

Add ability to reset filters to BPE

2014-08-08 14:05:53 +10:00

payment_methods

WIP: Angularise payment methods on enterprise edit page

2014-07-24 10:16:54 +10:00

products

Convert variant_unit_options to a method, camelcase

2014-07-18 12:44:58 +10:00

services

Switching enterprise relationships form around

2014-09-05 17:11:57 +10:00

shipping_methods

Add shipping method js infrastructure for angularising admin enterprises page

2014-07-24 10:16:54 +10:00

users

Initialise user autocomplete element using data from element itself rather than AJAX request

2014-09-11 14:39:15 +10:00

admin.js.coffee

configure textAngular on enterprise edit page

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

all.js

move text angular files

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

bulk_order_management.js.coffee

Swtich API key injection over to helper

2014-09-11 17:07:05 +10:00

bulk_product_update.js.coffee

open products in new tab

2014-09-24 17:00: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

When removing outgoing exchanges, do not removing variants from other outgoing exchanges

2014-09-12 12:50:04 +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

variant_autocomplete_with_distribution_filter.js.coffee

Rename JS file so that it is loaded after the spree code it is overriding. Admin can't add products outside distribution to an order.

2014-07-16 11:26:22 +10:00