aboutsummaryrefslogtreecommitdiffstats
path: root/app/helpers
Commit message (Collapse)AuthorAgeLines
* Make sure regexes used in highlight helper are UTF-8 encodedLouise Crow2015-05-28-0/+1
|
* Fix failure to capitalise when non category tag precedes categories.Louise Crow2015-04-07-3/+4
| | | | Thanks to @RichardTaylor for reporting.
* Merge branch '59-localised-authority-links' into rails-3-developLouise Crow2015-03-05-0/+26
|\ | | | | | | | | Conflicts: app/views/public_body/show.html.erb
| * Use routing helper to generate localised urls.Louise Crow2015-03-05-0/+26
| |
* | Don't show two 'Make a request' buttons if there's no contact info.Louise Crow2015-03-02-1/+1
|/
* Refactor showing the Make Request buttonGareth Rees2015-02-20-0/+35
| | | | | | | | | | | | | | | 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
* Use RESTful routes for CRUD admin user actionsLouise Crow2014-12-18-3/+3
|
* Move show method to use RESTful routingLouise Crow2014-12-18-1/+1
|
* Use RESTful routing for index and show actionsLouise Crow2014-12-12-1/+1
|
* Merge branch 'issues/222-category-editing-add-order-interface' into ↵Louise Crow2014-10-14-0/+14
|\ | | | | | | rails-3-develop
| * Enable admins to link public body categories to headingslizconlan2014-09-22-0/+14
| |
* | Add an action to run the checksGareth Rees2014-09-25-0/+8
|/
* Add spec for highlight_and_excerptGareth Rees2014-06-25-0/+1
|
* Use regex based highlightingGareth Rees2014-06-25-12/+17
|
* Add helper to highlight and excerpt by regexGareth Rees2014-06-25-19/+95
| | | | | | | Backport of https://github.com/rails/rails/pull/11793/ Contains integration tests to check that it works as expected with ActsAsXapian.
* Remove DateTimeHelper#year_from_dateGareth Rees2014-06-05-14/+0
| | | | DateTime, Date and Time all have #year methods
* Minor tidying of DateTimeHelper and specsGareth Rees2014-06-05-4/+4
|
* Add specs for DateTimeHelper#simple_timeGareth Rees2014-06-05-1/+11
|
* Add specs for DateTimeHelper#year_from_dateGareth Rees2014-06-05-1/+11
|
* Move date helpers to DateTimeHelperGareth Rees2014-06-05-62/+66
|
* Remove duplication from new correspondence urlsGareth Rees2014-06-05-8/+23
|
* Add cache-busting to request response notificationGareth Rees2014-06-04-2/+6
| | | | | | 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.
* Add missing full stops from new translationsLouise Crow2014-05-15-24/+24
|
* Merge branch 'feature/1310-better-track-translation' into rails-3-developLouise Crow2014-04-04-6/+128
|\ | | | | | | | | Conflicts: spec/factories.rb
| * Remove explicit escaping callsLouise Crow2014-03-24-9/+9
| | | | | | | | Will be done automatically in Rails 3
| * Move track descriptions to a helper.Louise Crow2014-03-24-0/+20
| | | | | | | | We can access url generation methods more easily here.
| * Add notices for unsubscribing from things.Louise Crow2014-03-24-0/+23
| | | | | | | | | | These are full sentences, not composed on the fly, so should be easier to translate.
| * Add notices for subscribing to something.Louise Crow2014-03-24-0/+53
| | | | | | | | | | These notices are complete sentences, not composed on the fly, so should be easier to translate.
| * Add notices for subscribing something you're subscribed to.Louise Crow2014-03-24-0/+26
| | | | | | | | | | These notices are full sentences, rather than being composed of phrases, which should make them easier to translate.
* | Add AdminHelper#comment_visibilityGareth Rees2014-03-25-0/+5
| | | | | | | | Get the canonical human-readable status of a comment
* | Merge branch 'feature/1313-better-translation-markup' into rails-3-developLouise Crow2014-03-24-3/+45
|\ \
| * | Refactor event description to make it easier to translate.Louise Crow2014-03-17-0/+42
| | | | | | | | | | | | Closes #1313 and #365.
| * | Remove redundant h() callsLouise Crow2014-03-13-3/+3
| |/ | | | | | | Text will be escaped by default in Rails 3
* / Add formatting options to LinkToHelper#simple_dateGareth Rees2014-03-13-3/+48
|/
* Merge branch 'feature/cache-request-lists' into rails-3-developLouise Crow2014-01-28-0/+13
|\
| * Cache frequently accessed request lists.Louise Crow2013-12-19-0/+13
| | | | | | | | 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.
* | Pass explicit value for absoluteLouise Crow2014-01-28-2/+2
| | | | | | | | Previous syntax broken under Ruby 1.8.7.
* | Link 'anonymous' users to help section with explanation.Louise Crow2014-01-14-6/+19
|/ | | | | | | 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
* Merge remote-tracking branch 'origin/merged-rails-3-2-assset-pipeline' into ↵Louise Crow2013-11-29-4/+4
|\ | | | | | | | | | | | | rails-3-develop Conflicts: Gemfile.lock
| * In excerpt, radius is now an option.Louise Crow2013-11-12-2/+2
| | | | | | | | Passing it as an argument is deprecated.
| * Highlighter is now an option.Louise Crow2013-11-12-2/+2
| | | | | | | | Passing it as an argument is deprecated.
* | Make fragment caching dependent on a config variable.Louise Crow2013-11-25-0/+7
|/
* Add public criteria for message event access methodsLouise Crow2013-09-16-1/+1
| | | | | | | 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.
* Remove unused method.Louise Crow2013-06-25-3/+0
|
* Merge branch 'hotfix/0.8.0.1' into rails-3-developLouise Crow2013-04-02-1/+1
|\ | | | | | | | | | | Conflicts: config/environment.rb spec/mailers/track_mailer_spec.rb
| * Use full urls in outgoing_message_url as the name impliesMatthew Landauer2013-04-02-1/+1
| |
* | Change email address in header of source code to hello@mysociety.orgMatthew Landauer2013-03-26-2/+2
| |
* | Merge remote-tracking branch 'mysociety/develop' into rails-3-developHenare Degan2013-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 Crow2013-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 helperMatthew Landauer2013-03-08-4/+0
| | |