| Commit message (Collapse) | Author | Age | Lines |
| |
|
| |
|
|
|
|
|
| |
So data changing actions require a POST and can be protected against
CSRF.
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Move specs that involve receiving email and then viewing the interface
to be integration specs, which is what they really are.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
- Danger button for permenantly destroying request
- Primary button for saving changes
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Went with a simple option of just adding the link.
We could add a form which submits the email automatically, but there are
a few cases where this might be more complex:
- If the To: contains more than one email
- If the address is already on the spam list
- Redirecting back to the correct page depending on which form was
submitted
- Additional help text on show_raw_email
|
|
|
|
| |
Get the canonical human-readable status of a comment
|
| |
|
| |
|
|
|
|
|
| |
Parameterise /admin_request/_some_annotations.html.erbi to allow it
to be called from user and request pages
|
|
|
|
| |
And refactor admin_request/show.html.erb to use this.
|
|
|
|
| |
From the request admin page.
|
|
|
|
| |
The order is the same as the default association.
|
| |
|
| |
|
|
|
|
| |
Eventually this should use standard RESTful routing.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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:
Gemfile
Gemfile.lock
app/views/admin_request/show.html.erb
config/environment.rb
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
we didn't run into a problem here before
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
'openaustralia_github/use_url_helpers_in_admin_links' into develop
Conflicts:
app/views/admin_request/_incoming_message_actions.rhtml
app/views/admin_request/show.rhtml
|