| Commit message (Collapse) | Author | Age | Lines |
|\
| |
| |
| |
| |
| |
| | |
rails-3-develop
Conflicts:
Gemfile.lock
|
| |
| |
| |
| |
| | |
In render calls, that's now deprecated in favour of using the :formats
option.
|
| | |
|
|/ |
|
|
|
|
|
|
| |
In fact, we do still need to set permissions.
This reverts commit 56ce526acdcb1b5493bc11f14b751b5c3f02f686.
|
|
|
|
| |
Fixes #1101.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
Gemfile
app/views/admin_request/edit_outgoing.html.erb
config/packages
doc/CHANGES.md
doc/INSTALL.md
spec/models/info_request_spec.rb
spec/models/public_body_spec.rb
|
| |
| |
| |
| |
| | |
As @mhl points out, this more clearly indicates that they may come back
at some point.
|
| |
| |
| |
| |
| | |
Either rails or the webserver will be sending it, we're not redirecting
anymore.
|
| |
| |
| |
| |
| | |
So that files attached to different messages with the same name and
url_part don't get overwritten.
|
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
| |
| |
| |
| |
| |
| | |
Use send_file to send zips. Also adds 'all_can_view_all_correspondence?'
- is this request completely cachable, or do we need to cache different
versions for different levels of privilege?
|
| |
| |
| |
| |
| |
| | |
This was disabled for hidden requests as the download was by redirect,
allowing people who have not been authenticated to conceivably access
the download. We'll be moving to send_file instead, so can restore it.
|
| |
| |
| |
| |
| |
| | |
This should be handled by assign_variables_for_show_template. Otherwise,
the make_request_summary_file method shouldn't depend on instance
variables
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Adds a spec for what we want to see - no message text in
correspondence.txt, and no attachments. Refactors the
simple_correspondence templates to make it clearer that these are doing
the same job as the html.erb ones, for text.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Render the show template within the current thread rather than making
another request - we're going to need to use the current session in
order to know what do include in the zip file, now that we have more
fine-grained visibility of messages. Also, this will mean we can use
this functionality in single threaded contexts, and test it more easily.
Don't display profile photos as this would require another process, and
hide other icons so we don't need to include them. Use render_to_string
as a more standard way of rendering templates to a string for further
manipulation.
|
| |
| |
| |
| |
| |
| | |
So we can reuse them when rendering the show template to a file. Lots of
the sidebar prep isn't going to be needed for that view, so make that
optional in the template.
|
| |
| |
| |
| |
| | |
Split into those that come from request params and those that come from
the model
|
| | |
|
|/ |
|
|\ |
|
| |
| |
| |
| | |
strings that are available for translation. Fixes #1003.
|
|\ \
| |/
|/|
| |
| |
| |
| | |
'openaustralia_github/tests_set_described_state' into rails-3-develop
Conflicts:
spec/models/info_request_spec.rb
|
| | |
|
| | |
|
|\ \ |
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | | |
'openaustralia_github/more_info_on_report_request' into rails-3-develop
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
|\ \ \ \
| |_|/ /
|/| | |
| | | | |
'openaustralia_github/inline_search_method_refactor' into rails-3-develop
|
| |/ / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Otherwise redirects will be cached, and since headers and the status
code aren't stored, a non-redirecting redirect page will be returned
in the future, but with 200. It's easiest to only cache the 200
responses.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If the display_filename of the attachment found from the
URL part number doesn't match the passed in display_filename
then the email may have been reparsed, causing a reordering.
In that case, look to see if there is another attachment that
uniquely matches that filename, and, if so, return that other
attachment. If no matching uniquely matching filename is
found, redirect to the incoming message, rather than
returning a 404.
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | | |
ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
|
| | |/
| |/|
| | |
| | |
| | | |
Both of these files include multi-byte UTF-8 sequences,
so should have a 'magic comment' specifying the encoding.
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
Gemfile.lock
app/controllers/public_body_controller.rb
app/mailers/track_mailer.rb
app/views/request/_hidden_correspondence.html.erb
app/views/request/_sidebar.html.erb
app/views/request/hidden.html.erb
app/views/request/new_please_describe.html.erb
app/views/request/preview.html.erb
app/views/user/show.html.erb
config/environment.rb
config/routes.rb
spec/controllers/public_body_controller_spec.rb
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
app/models/outgoing_message.rb
app/views/general/search.rhtml
app/views/public_body/list.rhtml
app/views/public_body/show.rhtml
app/views/public_body/view_email.rhtml
app/views/request/_after_actions.rhtml
app/views/request/_followup.rhtml
app/views/request/_sidebar.rhtml
app/views/request/new.rhtml
app/views/request/select_authority.rhtml
app/views/request/upload_response.rhtml
locale/aln/app.po
locale/app.pot
locale/ar/app.po
locale/bs/app.po
locale/ca/app.po
locale/cs/app.po
locale/cy/app.po
locale/de/app.po
locale/en/app.po
locale/en_IE/app.po
locale/es/app.po
locale/eu/app.po
locale/fr/app.po
locale/gl/app.po
locale/hu_HU/app.po
locale/id/app.po
locale/nb_NO/app.po
locale/pt_BR/app.po
locale/ro_RO/app.po
locale/sl/app.po
locale/sq/app.po
locale/sr@latin/app.po
locale/tr/app.po
locale/uk/app.po
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
app/controllers/general_controller.rb
|
| |_|/
|/| | |
|