| Commit message (Collapse) | Author | Age | Lines |
|
|
|
| |
Thanks to @RichardTaylor for reporting.
|
|\
| |
| |
| |
| | |
Conflicts:
app/views/public_body/show.html.erb
|
| | |
|
|/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The code here was hard to follow. Now we have a cleaner path to decide
whether to show the Make Request button or not.
- Always show any notes associated with the body
- If a request can be made to the body
- Show any tag-specific notes that may affect the request
- Show the Make Request button
- If a request cannot be made to the body
- Show the most relevant reason why a request cannot be made
Added PublicBodyHelper#public_body_not_requestable_reasons to extract
the logic of finding the reason a user can’t request out of the template
|
| |
|
| |
|
| |
|
|\
| |
| |
| | |
rails-3-develop
|
| | |
|
|/ |
|
| |
|
| |
|
|
|
|
|
|
|
| |
Backport of https://github.com/rails/rails/pull/11793/
Contains integration tests to check that it works
as expected with ActsAsXapian.
|
|
|
|
| |
DateTime, Date and Time all have #year methods
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
Users get a new response email, click the link, but get a cached page.
This is a quick fix to ensure they always see the response when clicking
the link.
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
spec/factories.rb
|
| |
| |
| |
| | |
Will be done automatically in Rails 3
|
| |
| |
| |
| | |
We can access url generation methods more easily here.
|
| |
| |
| |
| |
| | |
These are full sentences, not composed on the fly, so should be easier
to translate.
|
| |
| |
| |
| |
| | |
These notices are complete sentences, not composed on the fly, so should
be easier to translate.
|
| |
| |
| |
| |
| | |
These notices are full sentences, rather than being composed of phrases,
which should make them easier to translate.
|
| |
| |
| |
| | |
Get the canonical human-readable status of a comment
|
|\ \ |
|
| | |
| | |
| | |
| | | |
Closes #1313 and #365.
|
| |/
| |
| |
| | |
Text will be escaped by default in Rails 3
|
|/ |
|
|\ |
|
| |
| |
| |
| | |
Make specs a bit more focused, remove view specs - they're not relevant to the new code in their current form and don't seem to merit updating.
|
| |
| |
| |
| | |
Previous syntax broken under Ruby 1.8.7.
|
|/
|
|
|
|
|
| |
Requests submitted using the write API may have an anonymous user. Add a
section to the FAQ explaining this, and link to it from those requests.
Note this commit removes some 'h' calls that are no longer needed in
Rails 3. Contributes to https://github.com/mysociety/alaveteli/issues/1286
|
|\
| |
| |
| |
| |
| |
| | |
rails-3-develop
Conflicts:
Gemfile.lock
|
| |
| |
| |
| | |
Passing it as an argument is deprecated.
|
| |
| |
| |
| | |
Passing it as an argument is deprecated.
|
|/ |
|
|
|
|
|
|
|
| |
get_last_response_event and get_last_outgoing_event are used in various
places to determine which events to link to, use in queries etc.
Restrict them to refer to the last publicly visible event of the
relevant type, and rename them to make that clear.
|
| |
|
|\
| |
| |
| |
| |
| | |
Conflicts:
config/environment.rb
spec/mailers/track_mailer_spec.rb
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
'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
|
| | | |
|
| | | |
|