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

	Commit message (Collapse)	Author	Age	Lines
*	Change email address in header of source code to hello@mysociety.org	Matthew Landauer	2013-03-26	-2/+2
\|
*	Merge branch 'develop' into rails-3-develop	Louise Crow	2013-03-19	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Gemfile Gemfile.lock app/views/admin_request/show.html.erb config/environment.rb
\| *	Follow alphabetical ordering.	Louise Crow	2013-03-19	-1/+1
\| \|
\| *	Allow the emergency user account to be disabled.	Louise Crow	2013-03-19	-0/+1
\| \|
* \|	Rails security update	Matthew Landauer	2013-03-19	-67/+0
\| \| \| \| \| \| \| \| \| \|	The rails upgrade also forces a mail gem upgrade. To make things work again we need to remove part of the monkeypatched backporting of encoding fixes.
* \|	Remove Rails 2 patch from 1e958d20f674dabde9e8fc6606edc704d4f93b66	Henare Degan	2013-03-14	-19/+0
\| \|
* \|	Merge remote-tracking branch 'mysociety/develop' into rails-3-develop	Henare Degan	2013-03-14	-10/+25
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 ↵	Louise Crow	2013-03-13	-0/+24
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'openaustralia_github/one_support_email_on_admin_attention_state' into develop Conflicts: Gemfile.lock app/controllers/request_controller.rb app/models/request_mailer.rb app/views/admin_general/index.rhtml spec/models/request_mailer_spec.rb
\| \| *	Fix bug in rails 2 cookiestore that only shows up when using integration tests	Matthew Landauer	2013-03-06	-0/+19
\| \| \|
\| \| *	Extract method that knows who can update the state of a request	Matthew Landauer	2013-03-03	-0/+5
\| \| \|
\| * \|	Merge remote-tracking branch 'openaustralia_github/force-ssl' into develop	Louise Crow	2013-03-12	-0/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Gemfile.lock
\| \| * \|	Add configuration to force ssl for the whole site	Matthew Landauer	2013-02-15	-0/+1
\| \| \|/
\| * \|	Remove monkeypatch that makes tag helper html4 compliant	Matthew Landauer	2013-03-07	-8/+0
\| \| \|
\| * \|	Configurations ADMIN_BASE_URL and ADMIN_PUBLIC_URL are no longer used anywhere	Matthew Landauer	2013-02-15	-2/+0
\| \|/
* \|	Backport Mail's encoding code from 2.5 for Ruby 1.9	Henare Degan	2013-03-07	-0/+45
\| \| \| \| \| \| \| \|	Decoding messages in Ruby 1.9 was screwing up but not dying like 1.8. Backporting this fixes the problem.
* \|	See how we go not disabling this now	Henare Degan	2013-03-03	-21/+0
\| \|
* \|	Rename Configuration class to avoid conflict with ActiveSupport::Configurable	Henare Degan	2013-03-03	-10/+10
\| \|
* \|	Different class in newer version of will_paginate	Henare Degan	2013-03-03	-1/+1
\| \|
* \|	Revert "Update this to match the older version of the mail gem we're using"	Henare Degan	2013-03-03	-1/+2
\| \| \| \| \| \| \| \|	This reverts commit b9a2d996408c1ef703aa78311f8c2a0f6e0d7afc.
* \|	Backport Mail 2.5's to_yaml to prevent an exception with Ruby 1.8	Henare Degan	2013-03-02	-0/+22
\| \|
* \|	Backport newer Mail code to fix decoding problems. #850	Henare Degan	2013-03-02	-0/+38
\| \|
* \|	Remove Tmail and use the Mail gem under Ruby 1.8.7 as well	Henare Degan	2013-02-27	-437/+4
\| \|
* \|	create_ is deprecated	Henare Degan	2013-02-25	-22/+22
\| \|
* \|	Our older version of Mail returns a different class so cast it to a String	Henare Degan	2013-02-21	-1/+1
\| \|
* \|	We're using an older version of Mail that returns a different class	Henare Degan	2013-02-21	-3/+3
\| \|
* \|	Merge branch 'develop' into rails-3-spike	Henare Degan	2013-02-15	-3/+12
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Gemfile Gemfile.lock app/controllers/general_controller.rb app/controllers/track_controller.rb app/models/outgoing_message.rb app/models/public_body.rb app/models/user.rb app/views/general/frontpage.rhtml config/environment.rb config/initializers/inflections.rb config/initializers/mime_types.rb db/migrate/094_remove_old_tags_foreign_key.rb lib/timezone_fixes.rb spec/models/request_mailer_spec.rb spec/views/request/list.rhtml_spec.rb
\| *	Simple task for converting .po files to a standard msgmerge format.	Louise Crow	2013-02-08	-3/+12
\| \|
\| *	Merge remote-tracking branch ↵	Louise Crow	2013-02-01	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \|	'openaustralia_github/backport_rails_3_mailer_fix' into develop
\| \| *	Rename mailer method to avoid naming conflict in Rails 3	Matthew Landauer	2013-01-25	-1/+1
\| \| \|
\| * \|	Calling TMail::Mail#base64_decode does not modify the mail object so doesn't ↵	Matthew Landauer	2013-01-28	-10/+7
\| \|/ \| \| \| \| \| \|	do anything as used here
\| *	Merge remote-tracking branch 'openaustralia_github/rails_xss' into develop	Louise Crow	2013-01-16	-25/+21
\| \|\
\| * \|	Small comment edit in timezone_fixes to remind that this can be removed in ↵	Matthew Landauer	2013-01-16	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Rails 3.x
* \| \|	Update this to match the older version of the mail gem we're using	Henare Degan	2013-02-10	-3/+2
\| \| \|
* \| \|	Remove rack_quote_monkeypatch because it should not be needed in Rails 3	Matthew Landauer	2013-01-29	-65/+0
\| \| \|
* \| \|	Calling TMail::Mail#base64_decode does not modify the mail object so doesn't ↵	Matthew Landauer	2013-01-28	-10/+7
\| \| \| \| \| \| \| \| \| \| \| \|	do anything as used here
* \| \|	Merge branch 'rails_xss' into rails-3-spike	Matthew Landauer	2013-01-25	-27/+20
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Gemfile Gemfile.lock config/environment.rb lib/i18n_fixes.rb
\| * \|	Merge remote-tracking branch 'mysociety/develop' into rails_xss	Matthew Landauer	2013-01-15	-9/+710
\| \|\\|
\| \| *	If we're not going to run the commonlib tests (and I think that's correct - ↵	Louise Crow	2012-12-18	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \|	they belong in commonlib and should only be run when commonlib is changed), then don't load them. Allows us not to include the rspec gem in production.
\| \| *	Include Rake::DSL module manually to avoid deprecation warnings as per	Louise Crow	2012-12-18	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/dchelimsky/rspec-rails/commit/be52a9841dde0292c7bc7ecfe39e7214b4db1cab
\| * \|	Removed reserved keys in gettext_interpolation because they were unused and ↵	Matthew Landauer	2013-01-15	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \|	untested
\| * \|	There's no way that gettext_interpolate would work when not passed a hash - ↵	Matthew Landauer	2013-01-15	-25/+15
\| \| \| \| \| \| \| \| \| \| \| \|	untested and unused. So removing.
\| * \|	Remove escaping of code in gettext_interpolation because it's not used and ↵	Matthew Landauer	2013-01-15	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \|	not tested
\| * \|	Fix translations with interpolations to correctly handle safe_html	Matthew Landauer	2013-01-15	-3/+11
\| \| \|
\| * \|	Added comment about the syntax of the interpolations in the translations	Matthew Landauer	2013-01-15	-0/+4
\| \| \|
\| * \|	Revert "Assume the result of doing any translation is html_safe"	Matthew Landauer	2013-01-14	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 493e8e7ec43351952e2d7876afaede0cdb5d3644.
* \| \|	In rails 3 sendmail is passed the destination of the email on the ↵	Matthew Landauer	2013-01-25	-21/+0
\| \| \| \| \| \| \| \| \| \| \| \|	commandline. Also, monkeypatch not needed anymore
* \| \|	Rename mailer method to avoid naming conflict in Rails 3	Matthew Landauer	2013-01-25	-1/+1
\| \| \|
* \| \|	Remove timezone monkeypatch fixes because they're not necessary in Rails 3 ↵	Matthew Landauer	2013-01-25	-26/+0
\| \| \| \| \| \| \| \| \| \| \| \|	anymore
* \| \|	Small comment edit in timezone_fixes to remind that this can be removed in ↵	Matthew Landauer	2013-01-25	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Rails 3.x
* \| \|	Fix path to main configuration file. How did this ever work before?	Matthew Landauer	2013-01-25	-2/+2
\| \| \|