alaveteli - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Lines
*	Merge remote-tracking branch 'mysociety/develop' into rails-3-develop	Henare Degan	2013-03-14	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Gemfile Gemfile.lock app/controllers/admin_request_controller.rb app/controllers/admin_track_controller.rb app/controllers/request_controller.rb app/controllers/services_controller.rb app/helpers/link_to_helper.rb app/mailers/request_mailer.rb app/models/application_mailer.rb app/models/info_request.rb app/views/admin_censor_rule/edit.html.erb app/views/admin_censor_rule/new.html.erb app/views/admin_public_body/_form.html.erb app/views/admin_public_body/_locale_selector.html.erb app/views/admin_public_body/_one_list.html.erb app/views/admin_public_body/edit.html.erb app/views/admin_public_body/list.html.erb app/views/admin_public_body/new.html.erb app/views/admin_request/_incoming_message_actions.html.erb app/views/admin_request/edit.html.erb app/views/admin_request/edit_comment.html.erb app/views/admin_request/edit_outgoing.html.erb app/views/admin_request/list.html.erb app/views/admin_request/list_old_unclassified.html.erb app/views/admin_request/show.html.erb app/views/admin_track/_some_tracks.html.erb app/views/admin_track/list.html.erb app/views/admin_user/edit.html.erb app/views/admin_user/list.html.erb app/views/admin_user/show.html.erb app/views/general/_footer.html.erb app/views/general/exception_caught.html.erb app/views/help/contact.html.erb app/views/layouts/default.html.erb app/views/public_body/_alphabet.html.erb app/views/request/_request_listing_single.html.erb app/views/request/_sidebar.html.erb app/views/request/new.html.erb app/views/request/show.html.erb app/views/request_mailer/external_response.rhtml app/views/request_mailer/fake_response.rhtml config/environment.rb config/environments/production.rb config/routes.rb spec/controllers/admin_censor_rule_controller_spec.rb spec/controllers/request_controller_spec.rb spec/controllers/track_controller_spec.rb spec/helpers/link_to_helper_spec.rb spec/mailers/request_mailer_spec.rb spec/models/info_request_spec.rb spec/spec_helper.rb spec/views/public_body/show.html.erb_spec.rb spec/views/request/show.html.erb_spec.rb vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
\| *	Merge remote-tracking branch 'openaustralia_github/make-links-relative' into ↵	Louise Crow	2013-03-06	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	develop Conflicts: app/controllers/admin_request_controller.rb app/models/request_mailer.rb app/views/admin_general/index.rhtml app/views/admin_general/stats.rhtml app/views/admin_public_body/_one_list.rhtml app/views/admin_public_body/_tags.rhtml app/views/admin_public_body/show.rhtml app/views/admin_request/show.rhtml app/views/admin_user/show.rhtml app/views/layouts/admin.rhtml app/views/public_body/show.rhtml app/views/request/new.rhtml
\| \| *	Rename helper method	Matthew Landauer	2013-02-15	-1/+1
\| \| \|
\| * \|	Mark html string in country message as html safe	Matthew Landauer	2013-02-20	-1/+1
\| \|/
* /	Rename Configuration class to avoid conflict with ActiveSupport::Configurable	Henare Degan	2013-03-03	-3/+3
\|/
*	html escaping fix	Matthew Landauer	2013-01-15	-1/+1
\|
*	Fix bug where visitors from overseas visit a site which is not officially ↵	Matthew Landauer	2012-10-19	-2/+3
\| \| \| \|	live yet
*	Inline temporary variable	Matthew Landauer	2012-10-19	-3/+2
\|
*	Extract configuration with defaults into one module	Matthew Landauer	2012-09-25	-3/+3
\|
*	Use user_name instead of user.name to handle external requests.	Louise Crow	2012-08-22	-4/+7
\|
*	Move variable restore to an ensure block	Robin Houston	2012-08-01	-8/+12
\| \| \| \| \| \|	I think this whole thing is redundant anyway, since the locale is set at the start of each request, but if we’re going to save/restore this value then we might as well do so correctly.
*	Make the logic that tells you about other countries' Alavetelis prefer the ↵	Seb Bacon	2012-05-30	-0/+3
\| \| \| \|	browser language; and make the tests pass.
*	Support easy hiding of requests for admins. Currently not exposed in core ↵	Seb Bacon	2012-05-25	-0/+11
\| \| \| \|	admin interface (requires adminbootstraptheme).
*	Remove misleading copy-pasted comment	Robin Houston	2012-01-24	-9/+1
\|
*	Flash a message to users from outside the deployed country, telling them ↵	Seb Bacon	2011-09-05	-0/+32
	about either (a) a website in their country, or (b) the existence of Alaveteli to help them make one themselves. Closes #124.