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

..

controllers

Hide closed shops by default, add "show" button

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

directives

Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login

2016-04-01 11:04:36 +11:00

filters

Credit/debit formatting, use filters for money formatting, use full page width for table

2016-01-28 22:42:45 +00:00

mixins

Internationalisation of Javascript views

2015-10-01 11:13:45 +10:00

services

Auto-merged master into uk/account-balances on deployment.

2016-03-19 07:16:41 +11:00

all.js.coffee

Make brand story animate slide down/up

2015-06-26 15:54:25 +10:00

cart.js.coffee

Internationalisation of Javascript views

2015-10-01 11:13:45 +10:00

darkswarm.js.coffee

Make brand story animate slide down/up

2015-06-26 15:54:25 +10:00

i18n.js.erb

Invalidate I18n asset if locale changes

2015-11-05 12:47:15 +11:00

i18n.translate.js.coffee

Translate Spree payment, shipment and order states

2016-03-09 14:29:54 +11:00

overrides.js.coffee

Displaying server errors as well

2014-04-10 17:21:34 +10:00

util.js.coffee

When a registering an enterprise with a non-unique name, display an error message.

2015-06-24 10:08:34 +10:00