Rob Harrington 439d122e93 Merge branch 'master' into customers ...

Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	db/schema.rb
	spec/javascripts/unit/bulk_order_management_spec.js.coffee

2015-06-03 15:19:40 +08:00

..

admin

Merge branch 'master' into customers

2015-06-03 15:19:40 +08:00

api

Order cycle filter resets date filters on BOM

2015-05-07 12:50:55 +10:00

checkout

Do not show tax in checkout

2015-04-17 13:39:09 +10:00

enterprise_mailer

Replacing all uses of the old enterprise shop url helper

2015-01-22 10:19:43 +11:00

enterprises

ng-cloak order cycles selector, tabs and shopfront

2015-05-29 16:39:41 +10:00

groups

Merge branch 'master' into optimise-shopfront

2015-06-03 10:07:42 +10:00

home

#541 Fixed issue of showing negative 'more' numbers, and only working for current Hub

2015-05-24 09:52:34 +10:00

json

Merge branch 'master' into optimise-shopfront

2015-06-03 10:07:42 +10:00

layouts

Inject current hub from AMS rather than RABL

2015-05-27 15:44:01 +10:00

map

Adding some map searching capabilities

2014-07-16 11:19:16 +10:00

modals

swap redundant producer modal for general enterprise modal

2014-10-07 10:48:04 +11:00

open_food_network

Rename namespaced includes from open_food_web to open_food_network

2013-10-18 17:43:18 +11:00

order_cycles

Adding list view links

2014-02-04 12:01:10 +11:00

producers

#541 add "show more" link to producers lists in hub on home page

2015-05-11 20:31:24 +10:00

products

Renaming everything to Shop

2013-12-05 13:40:05 +11:00

registration

Spacing

2015-03-27 13:09:25 +11:00

shared

ng-cloak mobile menu

2015-05-29 16:03:16 +10:00

shop

ng-cloak order cycles selector, tabs and shopfront

2015-05-29 16:39:41 +10:00

shopping_shared

ng-cloak order cycles selector, tabs and shopfront

2015-05-29 16:39:41 +10:00

spree

Merge branch 'master' into customers

2015-06-03 15:19:40 +08:00

user_passwords

Removing nothing special text and patching change password form slightly more

2014-04-08 18:07:55 +10:00