Rafael Schouten 8395dbb3e9 Merge branch 'master' into config ...

Conflicts:
	.gitignore
	Gemfile

2014-10-25 15:29:53 +11:00

..

backtrace_silencers.rb

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

comfortable_mexican_sofa.rb

Starting on on the map

2014-06-05 12:18:26 +10:00

db2fog.rb

Put db backups in their own bucket on S3, put db2fog cron commands in schedule.rb

2014-07-16 09:33:59 +10:00

delete_content_for.rb

Add delete_content_for helper, can be used for removing the sidebar from spree views

2013-09-10 08:45:59 +10:00

devise.rb

Add default scope to devise to stop it from checking other devise enabled models (in this case :enterprise)

2014-10-17 16:12:51 +11:00

inflections.rb

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

mime_types.rb

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

paperclip.rb

Auto-aligning BEFORE resizing

2014-05-30 15:23:42 +10:00

secret_token.rb

add figaro env config

2014-09-16 00:13:43 +10:00

serializers.rb

Spiking AMS implementation of data

2014-06-25 15:18:13 +10:00

session_store.rb

Rename misc items from openfoodweb to openfoodnetwork

2013-10-18 17:43:59 +11:00

simple_form.rb

Add default simple_form configuration, locales, scaffold

2012-06-19 10:29:26 +10:00

spree.rb

Merge branch 'master' into config

2014-10-25 15:29:53 +11:00

wrap_parameters.rb

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00