Tom Hughes 0d3a9ed9cb Merge branch 'master' into openstreetbugs ... Conflicts: Gemfile.lock app/views/browse/_map.html.erb app/views/user/view.html.erb config/locales/en.yml config/openlayers.cfg db/structure.sql vendor/assets/openlayers/OpenLayers.js		2012-08-22 20:52:08 +01:00
..
application_helper.rb	Merge branch 'master' into openstreetbugs	2012-08-22 20:52:08 +01:00
browse_helper.rb	Removed early return from printable name method	2012-04-05 13:53:41 +01:00
geocoder_helper.rb	Move some helper functions to better homes	2012-08-12 16:14:35 +01: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	Move some helper functions to better homes	2012-08-12 16:14:35 +01:00
user_roles_helper.rb	Move generation of role icons into a helper	2012-03-21 19:20:40 +00:00