Rohan Mitchell fe61cddda6 Merge branch 'local-organics' ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/store/variables.css.scss
	app/overrides/add_feedback_script.rb
	app/views/spree/shared/_order_details_steps_data.html.erb
	db/schema.rb
	script/rails
	spec/spec_helper.rb

2013-07-23 11:40:03 +10:00

..

add_bulk_edit_tab_to_products_admin_sub_menu.rb

WIP (Spree Update): change formats of tab overrides

2013-07-23 10:43:08 +10:00

add_change_distributor_form_to_checkout_address.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

add_cms_admin_tab.rb

Remove unneeded :partial from override

2013-02-14 15:35:50 +11:00

add_cms_checkout_distribution.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-06 11:25:26 +11:00

add_cms_tabs_to_main_nav_bar.rb

Move additional of tabs to main nav bar to defaces, rather than overriding view directly

2013-02-14 15:42:47 +11:00

add_cms_to_cart.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-06 11:25:26 +11:00

add_current_distributor_to_main_nav_bar.rb

Move additional of tabs to main nav bar to defaces, rather than overriding view directly

2013-02-14 15:42:47 +11:00

add_distributor_details_js_to_product.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-06 11:25:26 +11:00

add_distributor_details_to_product.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-06 11:25:26 +11:00

add_distributor_fees_to_cart_form.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-06 11:25:26 +11:00

add_distributor_to_add_to_cart_form.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-06 11:25:26 +11:00

add_distributor_to_admin_product_edit.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-07 13:07:14 +11:00

add_distributor_to_admin_product_new.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-06 11:25:26 +11:00

add_enterprise_fees_to_admin_configurations_menu.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-07 13:07:14 +11:00

add_enterprises_admin_tab.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-07 13:07:14 +11:00

add_group_buy_to_admin_product_edit.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-07 13:07:14 +11:00

add_order_cycles_admin_tab.rb

WIP (Spree Update): change formats of tab overrides

2013-07-23 10:43:08 +10:00

add_source_to_product.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-07 13:07:14 +11:00

add_supplier_and_group_buy_to_admin_product_new.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-07 13:07:14 +11:00

add_supplier_to_admin_product.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-07 13:07:14 +11:00

cart_item_description.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-07 13:07:14 +11:00

order_item_description.rb

Finished revision of defaces

2013-02-09 00:40:34 +11:00

rearrange_empty_cart_form.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

rearrange_inside_cart_form.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

replace_checkout_payment_button.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

replace_order_details_steps_data.rb

Finished revision of defaces

2013-02-09 00:40:34 +11:00

replace_payment_name_with_description.rb

WIP (Spree Update): Fix frontend order payment summary

2013-07-23 10:43:08 +10:00

replace_shipping_address_form_with_distributor_details.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

set_auth_token_in_backend.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

set_auth_token_in_frontend.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

sidebar_home_index.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

sidebar_product_index.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

sidebar_taxons_show.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

split_products_by_distributor_on_home.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

split_products_by_distributor_on_products_home.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

split_products_by_distributor_on_products_search.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

split_products_by_distributor_on_taxons_show.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00