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

	Commit message (Collapse)	Author	Age	Lines
*	Remove unused method.	Louise Crow	2013-06-25	-3/+0
\|
*	Merge branch 'hotfix/0.8.0.1' into rails-3-develop	Louise Crow	2013-04-02	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: config/environment.rb spec/mailers/track_mailer_spec.rb
\| *	Use full urls in outgoing_message_url as the name implies	Matthew Landauer	2013-04-02	-1/+1
\| \|
* \|	Change email address in header of source code to hello@mysociety.org	Matthew Landauer	2013-03-26	-2/+2
\| \|
* \|	Merge remote-tracking branch 'mysociety/develop' into rails-3-develop	Henare Degan	2013-03-14	-83/+136
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-11	-19/+39
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'openaustralia_github/make_ui_for_links_in_admin_interface_consistent' into develop Conflicts: app/views/admin_censor_rule/new.rhtml app/views/admin_general/index.rhtml app/views/admin_general/timeline.rhtml app/views/admin_request/_some_requests.rhtml app/views/admin_request/show.rhtml app/views/admin_track/_some_tracks.rhtml
\| \| *	Inline helper	Matthew Landauer	2013-03-08	-4/+0
\| \| \|
\| \| *	Use helpers for icons	Matthew Landauer	2013-03-08	-4/+16
\| \| \|
\| \| *	New helper for showing two links for a user	Matthew Landauer	2013-03-08	-1/+2
\| \| \|
\| \| *	Refactor user_admin_link_for_request	Matthew Landauer	2013-03-08	-3/+2
\| \| \|
\| \| *	Give explanatory titles to links which can be seen on hover	Matthew Landauer	2013-03-08	-4/+4
\| \| \|
\| \| *	Extract helper for making an icon	Matthew Landauer	2013-03-08	-3/+11
\| \| \|
\| \| *	Move admin specific helpers to AdminHelper	Matthew Landauer	2013-03-08	-18/+20
\| \| \|
\| \| *	Would help if I wrote that helper correctly	Matthew Landauer	2013-03-08	-2/+2
\| \| \|
\| \| *	Update admin specific helpers with new standard form of links	Matthew Landauer	2013-03-08	-2/+4
\| \|/
\| *	Merge remote-tracking branch 'openaustralia_github/make-links-relative' into ↵	Louise Crow	2013-03-06	-76/+106
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| *	Reinstate main_url and admin_url helpers with deprecation warning	Matthew Landauer	2013-02-18	-0/+26
\| \| \|
\| \| *	Remove unused parameters from helper method	Matthew Landauer	2013-02-15	-1/+1
\| \| \|
\| \| *	Fix incoming_message_url to return an absolute path. Don't use this helper ↵	Matthew Landauer	2013-02-15	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	with links
\| \| *	Remove unused helper	Matthew Landauer	2013-02-15	-4/+0
\| \| \|
\| \| *	Replace use of route_url(:only_path => true) with route_path where we can	Matthew Landauer	2013-02-15	-2/+2
\| \| \|
\| \| *	Inline helper method	Matthew Landauer	2013-02-15	-7/+3
\| \| \|
\| \| *	Inline helper	Matthew Landauer	2013-02-15	-5/+1
\| \| \|
\| \| *	Inline helper	Matthew Landauer	2013-02-15	-6/+2
\| \| \|
\| \| *	Stop using admin_url to generate absolute url for the admin interface	Matthew Landauer	2013-02-15	-9/+3
\| \| \|
\| \| *	Stop using main_url to generate absolute urls for the main site	Matthew Landauer	2013-02-15	-23/+6
\| \| \|
\| \| *	Make links relative	Matthew Landauer	2013-02-15	-0/+12
\| \| \|
\| \| *	Redirects should be done with absolute urls	Matthew Landauer	2013-02-15	-3/+6
\| \| \|
\| \| *	Rename helper method	Matthew Landauer	2013-02-15	-6/+6
\| \| \|
\| \| *	Make links to within the site use relative urls	Matthew Landauer	2013-02-15	-0/+5
\| \| \|
\| \| *	Redirects should be done with absolute urls	Matthew Landauer	2013-02-15	-1/+5
\| \| \|
\| \| *	Rename helper method	Matthew Landauer	2013-02-15	-8/+8
\| \| \|
\| \| *	Redirects should be done with absolute urls	Matthew Landauer	2013-02-15	-1/+5
\| \| \|
\| \| *	Rename helper method	Matthew Landauer	2013-02-15	-5/+5
\| \| \|
\| \| *	Make links to within the site use relative urls	Matthew Landauer	2013-02-15	-0/+12
\| \| \|
\| \| *	Add options parameter to url helpers	Matthew Landauer	2013-02-15	-6/+6
\| \| \|
\| \| *	Rename helper method	Matthew Landauer	2013-02-15	-1/+1
\| \| \|
\| \| *	Make link to follow up message relative	Matthew Landauer	2013-02-15	-4/+7
\| \| \|
\| \| *	Make tracking links relative	Matthew Landauer	2013-02-13	-7/+11
\| \| \|
\| \| *	Inline link helper method by using a preexisting named route	Matthew Landauer	2013-02-13	-4/+0
\| \| \|
\| * \|	Inline helper method	Matthew Landauer	2013-02-12	-8/+0
\| \|/
* /	Rename Configuration class to avoid conflict with ActiveSupport::Configurable	Henare Degan	2013-03-03	-5/+5
\|/
*	Mark output of highlight_words helper as html_safe	Matthew Landauer	2013-02-01	-1/+1
\|
*	Small refactor to make method more concise	Matthew Landauer	2013-02-01	-6/+3
\|
*	Escape error messages in foi_error_messages_for	Matthew Landauer	2013-01-03	-3/+3
\|
*	Merge remote-tracking branch 'henare_github/simple-date-time-zone' into develop	Louise Crow	2012-11-22	-1/+3
\|\
\| *	Fix regression by allowing Date objects too	Henare Degan	2012-11-21	-1/+3
\| \|
\| *	Make simple_date respect the time zone	Henare Degan	2012-11-18	-1/+1
\| \|
* \|	3093f5d97d89dfa3518babe00d3aefea9cde15ad contained a reversion for WDTK - ↵	Louise Crow	2012-11-20	-0/+7
\|/ \| \| \|	where due to the proxied admin interface, we can't rely on a shared session between front end and admin interface requests. So show the admin bar for all superusers.
*	Remove unused method.	Louise Crow	2012-11-08	-19/+0
\|