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

	Commit message (Collapse)	Author	Age	Lines
*	Merge branch 'hotfix/0.11.0.9' into rails-3-develop	Louise Crow	2013-06-11	-6/+4
\|\
\| *	Only do time calculation once.hotfix/0.11.0.9	Louise Crow	2013-06-11	-1/+2
\| \|
\| *	Get user records in batches, remove unneeded clause.	Louise Crow	2013-06-11	-5/+2
\| \|
* \|	Merge remote-tracking branch ↵	Louise Crow	2013-06-04	-1/+5
\|\ \ \| \|/ \|/\| \| \|	'openaustralia_github/inline_search_method_refactor' into rails-3-develop
\| *	Inline method InfoRequest.full_search	Matthew Landauer	2013-03-25	-1/+5
\| \|
* \|	Move "require 'alaveteli_file_types'" into the initializer	Mark Longair	2013-05-16	-2/+0
\| \|
* \|	Remove mailer patch methods that are no longer needed.	Louise Crow	2013-04-30	-32/+0
\| \|
* \|	Change email address in header of source code to hello@mysociety.org	Matthew Landauer	2013-03-26	-6/+6
\|/
*	Fix up syntax from the Rails 3 merge	Henare Degan	2013-03-15	-4/+4
\|
*	This was added in fef3e4ead66b49fa714cb2640998b3146c290ccd	Henare Degan	2013-03-15	-1/+2
\|
*	main_url was removed in 4c9f7f7f12a47b516137bf000c3f36120033a077	Henare Degan	2013-03-15	-1/+1
\|
*	Merge remote-tracking branch 'mysociety/develop' into rails-3-develop	Henare Degan	2013-03-14	-16/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
*	Rename Configuration class to avoid conflict with ActiveSupport::Configurable	Henare Degan	2013-03-03	-8/+8
\|
*	Remove Tmail and use the Mail gem under Ruby 1.8.7 as well	Henare Degan	2013-02-27	-117/+26
\|
*	Rename ALL THE TEMPLATES!!1!!!one!!1!!	Henare Degan	2013-02-27	-1/+1
\| \| \| \|	.rhtml is deprecated in favour of .erb in Rails 3
*	Fix some missing variables	Henare Degan	2013-02-26	-2/+2
\|
*	Upgrade UserMailer to new ActionMailer API	Henare Degan	2013-02-26	-28/+24
\|
*	Upgrade TrackMailer to new ActionMailer API	Henare Degan	2013-02-26	-7/+8
\|
*	Upgrade more of RequestMailer to new ActionMailer API	Henare Degan	2013-02-26	-21/+17
\| \| \| \|	Also change name of body instance method so it doesn't collide
*	Upgrade some of RequestMailer to new ActionMailer API	Henare Degan	2013-02-26	-71/+87
\|
*	Interpolation makes this easier to read	Henare Degan	2013-02-26	-1/+1
\|
*	Upgrade OutgoingMailer to new ActionMailer API	Henare Degan	2013-02-26	-14/+12
\|
*	Upgrade ContactMailer to new ActionMailer API	Henare Degan	2013-02-26	-29/+18
\|
*	Update to new mail sending API	Henare Degan	2013-02-25	-2/+2
\|
*	Update to new mail sending API	Henare Degan	2013-02-25	-5/+5
\|
*	Mailers have their own home in Rails 3	Henare Degan	2013-02-25	-0/+948