Tom Hughes 3d7eb387a7 Merge branch 'master' into notes ... Conflicts: Gemfile.lock app/assets/stylesheets/common.css.scss app/views/browse/_map.html.erb app/views/user/view.html.erb config/locales/en.yml		2013-01-15 21:11:35 +00:00
..
application_helper.rb	Merge branch 'master' into notes	2013-01-15 21:11:35 +00:00
browse_helper.rb	Match wikipedia language prefixes case insensitively	2012-10-07 16:03:10 +01:00
geocoder_helper.rb	Move caching of reverse geocodes to describe_location	2012-12-01 18:18:10 +00:00
notifier_helper.rb	Rework signup emails a bit	2012-11-05 09:54:58 +00:00
trace_helper.rb	Removed unused link_to_page from the trace helpers	2011-11-14 09:42:55 +00:00
user_blocks_helper.rb	New migration to add better auditing to user_roles and better column names there and on user_blocks. Added a helper for displaying block status messages.	2009-09-29 16:44:03 +00:00
user_helper.rb	Implemented Gravatar support	2012-10-18 18:59:38 +01:00
user_roles_helper.rb	Move generation of role icons into a helper	2012-03-21 19:20:40 +00:00