Maikel Linke 04f661f646 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into hide-closed-shops ...

Conflicts:
	config/locales/en.yml

2016-04-01 13:02:53 +11:00

..

shopping

Allow admins and managers to see restricted shops

2016-03-25 12:04:26 +11:00

account_spec.rb

Spec worked, links didn't :)

2016-01-31 11:00:07 +00:00

authentication_spec.rb

Put rspec-retry on flaky specs

2015-08-07 11:06:16 +10:00

cms_spec.rb

Disabling CMS specs

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

groups_spec.rb

fixing a bunch of tests

2015-02-12 16:36:18 +11:00

producers_spec.rb

Add shop-for-products-at to map producer modals

2015-07-10 15:51:57 +10:00

registration_spec.rb

Set public enterprise.email_address at registration

2016-03-04 17:50:04 +11:00

shops_spec.rb

Hide closed shops by default, add "show" button

2016-04-01 11:45:24 +11:00