Maikel Linke 903bd21577 Merge remote-tracking branch 'origin/master' into group-pages-merge ...

Conflicts:
	README.markdown
	db/schema.rb

2015-02-13 15:42:36 +11:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

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

controllers

Restrict ability to change managers of enterprises using update action

2015-02-12 11:34:58 +11:00

features

Merge remote-tracking branch 'origin/master' into group-pages-merge

2015-02-13 15:42:36 +11:00

helpers

Fixing link to group website

2015-02-07 19:31:16 +11:00

javascripts

Adding manager managment to enterprise edit form

2015-02-12 11:34:58 +11:00

lib

Find all producers for which we can create variant overrides

2015-02-04 10:13:35 +11:00

mailers

Rewire order confirmation email so that two separate emails are sent, one for customers and one for shop owners

2014-11-19 11:03:00 +11:00

models

Merge remote-tracking branch 'origin/master' into group-pages-merge

2015-02-13 15:42:36 +11:00

requests

Fix specs: feature specs requiring payment and shipping methods, race condition, double flash message issue

2014-11-01 12:11:50 +11:00

serializers

Move controller spec to serializer spec

2014-12-17 14:01:59 +11:00

support

use_short_wait can now take a flexible wait time

2015-01-07 16:28:03 +11:00

views

Rename spec to match view name change

2014-09-05 15:10:14 +10:00

factories.rb

Merge remote-tracking branch 'origin/master' into group-pages-merge

2015-02-13 15:42:36 +11:00

spec_helper.rb

Moving test seeding into spec/support/seeds.rb

2014-12-04 15:38:59 +11:00