Rob Harrington a96cdd5ee7 Merge branch 'master' into line_item_naming ...

Conflicts:
	app/views/admin/order_cycles/edit.html.haml

2015-11-13 09:54:26 +11:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

2014-09-06 12:00:27 +10:00

controllers

Merge branch 'master' into line_item_naming

2015-11-13 09:54:26 +11:00

features

Merge branch 'master' into line_item_naming

2015-11-13 09:54:26 +11:00

helpers

Decouple generic injection spec from EnterpriseSerializer

2015-06-03 12:53:46 +10:00

javascripts

Fixing Angular Specs for line items controller

2015-11-12 17:33:12 +11:00

jobs

Merge branch 'master' into line_item_naming

2015-11-13 09:54:26 +11:00

lib

Merge branch 'master' into line_item_naming

2015-11-13 09:54:26 +11:00

mailers

Fix quantity calculation

2015-11-05 09:43:44 +11:00

models

Merge branch 'master' into line_item_naming

2015-11-13 09:54:26 +11:00

performance

Fix currency issues, changed logo path

2015-06-18 15:38:46 +10:00

requests

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

serializers

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

support

Rename spec support method for faster tab completion on save_and_open_page

2015-11-11 11:53:04 +11:00

views/json

Removing stupid unusable spec

2015-04-09 17:20:31 +10:00

factories.rb

Merge branch 'master' into folklabs-producer-emails

2015-10-16 12:38:54 +11:00

spec_helper.rb

Adding paper_trail verisoning RSpec helpers

2015-09-17 22:37:44 +10:00