Tom Hughes 4d91fe3dd9 Merge branch 'master' into openstreetbugs ... Conflicts: Gemfile app/helpers/application_helper.rb app/views/site/index.html.erb		2012-09-20 16:01:24 +01:00
..
api	Implement API endpoint to query permissions.	2012-05-05 15:28:45 +01:00
browse	Merge branch 'master' into openstreetbugs	2012-09-20 16:01:24 +01:00
changeset	Use a standard application.js bundle	2012-08-27 20:31:17 +01:00
diary_entry	Move a chunk of non-markup ruby code from a view to the controller	2012-08-28 20:39:18 +01:00
export	Use start.html.erb views instead of _sidebar.html.erb partials	2012-08-27 21:28:41 +01:00
geocoder	Switch from Prototype to jQuery	2011-11-26 00:22:31 +00:00
layouts	Suppress any border on the logo	2012-09-19 12:12:45 +01:00
message	Preserve background colour when marking messages read/unread	2012-08-09 00:26:38 +01:00
notes	Restructure notes URLs according to standard rails conventions	2012-03-10 17:04:57 +00:00
notifier	Merge branch 'master' into openstreetbugs	2012-08-22 20:52:08 +01:00
oauth	Make OAuth work again	2011-11-16 21:13:25 +00:00
oauth_clients	Remove use of deprecated :comment attribute on link_to and button_to	2012-06-18 11:20:09 +01:00
redactions	Remove use of deprecated :comment attribute on link_to and button_to	2012-06-18 11:20:09 +01:00
site	Merge branch 'master' into openstreetbugs	2012-09-20 16:01:24 +01:00
trace	Improve "no traces" message	2012-08-01 10:56:19 +01:00
user	Merge branch 'master' into openstreetbugs	2012-09-20 16:01:24 +01:00
user_blocks	Add a paging control to the user blocks list	2012-07-18 21:36:40 +01:00