aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeLines
* Fix a small error in stats-graphs-improvementsMark Longair2013-11-03-2/+2
|
* Update the helpful model schema annotationsMark Longair2013-11-01-19/+22
| | | | These are regenerated with "bundle exec annotate"
* Merge branch 'stats-graphs-improvements' into rails-3-developMark Longair2013-10-31-14/+14
|\
| * Avoid an error when the statistics column hasn't been populatedMark Longair2013-10-31-14/+14
| | | | | | | | | | | | | | | | The 'if data' needs to be earlier to avoid an error if one of the statistics columns hasn't been filled in by the stats:update_public_bodies_stats rake task yet. Thanks to Louise Crow for pointing this out in code review.
* | Merge remote-tracking branch 'origin/stats-graphs-improvements' into ↵Louise Crow2013-10-30-8/+18
|\| | | | | | | rails-3-develop
| * Add (and use) minified versions of the Flot JavascriptMark Longair2013-10-15-1/+1
| |
| * Refactor to avoid repeating .each_with_index.mapMark Longair2013-10-15-4/+9
| |
| * Increase the number of public bodies per graph to 10Mark Longair2013-10-15-1/+1
| | | | | | | | | | | | Now that there are rotated names on the x axis we shouldn't need to worry about them overlapping, which was the reason for limiting the number to 8 in the first place.
| * Make bars in public body statistics charts clickableMark Longair2013-10-15-2/+2
| | | | | | | | | | | | | | | | | | Now if you click on the bar representing statistics for a particular public body, it will take you to that public body's page. In addition, the bars are highlighted when you hover over them.
| * Only include minimal information about public bodies in JSONMark Longair2013-10-15-1/+6
| | | | | | | | | | | | | | Previously, the JSON included all the columns from the public body table, which was unnecessary and included the public body's email address. Instead, just include the name and URL of the public body.
| * Rotate labels on the x-axis by 90 degreesMark Longair2013-10-15-1/+1
| | | | | | | | | | | | This commit adds the tickrotor extension to Flot, which allows rotated labels for public bodies. This extension is licensed under either MPL 1.1, GPL 2.0 or LGPL 2.1.
| * Update flot to a development versionMark Longair2013-10-15-1/+1
| | | | | | | | | | | | This updates flot to version 0c2f6e3, which should be shortly before the release of 0.8.2. This is required for the tickrotor extension (allowing rotated public body names on the x-axis).
* | Merge remote-tracking branch 'origin/command-line-csv-import' into ↵Louise Crow2013-10-30-0/+2
|\ \ | | | | | | | | | rails-3-develop
| * | Add a rake task to import public bodies from a CSV fileMark Longair2013-10-15-0/+2
| |/ | | | | | | | | | | | | | | For importing a very large number of public bodies, it's mostly likely less frustrating to import them from the CSV file using this rake task instead of using the form in the admin interface. Fixes #1132
* | Merge branch 'hotfix/0.14.0.3' into rails-3-developLouise Crow2013-10-24-1/+2
|\ \ | |/ |/|
| * Don't allow redirects to another host.Louise Crow2013-10-02-1/+2
| |
| * Handle salutations with regexp special characters.0.14.0.1Louise Crow2013-09-30-1/+1
| | | | | | | | Fixes #1104.
* | Merge branch 'feature/email-subject-cleanup' into rails-3-developLouise Crow2013-10-07-8/+2
|\ \
| * | Move special case to whatdotheyknow-themeLouise Crow2013-10-04-8/+2
| | | | | | | | | | | | | | | Apart from anything else, we don't want translators to have to worry about the special case text. See https://github.com/mysociety/whatdotheyknow-theme/commit/2078febca5181ce3b1a9c0fae0123ae5f6448718 for the corresponding change to whatdotheyknow-theme.
* | | Merge branch 'feature/followup-translators-notes' into rails-3-developLouise Crow2013-10-07-2/+13
|\ \ \
| * | | Add some translator's notes on the use of 'follow up'.Louise Crow2013-10-04-2/+13
| |/ /
* | | Merge remote-tracking branch 'origin/first-letter-unicode-fixes' into ↵Louise Crow2013-10-07-3/+3
|\ \ \ | |/ / |/| | | | | rails-3-develop
| * | Fix upcasing of a non-US-ASCII first letter under Ruby 1.8Mark Longair2013-10-04-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | In the rare circumstance that someone created a public body whose name started with a lower case letter outside [a-z] with Alaveteli running under Ruby 1.8, the letter would not be upcased correctly before saving to the first_letter column. This commit fixes that by using a Unicode-aware upcase function.
| * | Allow public body listing based on first letter outside US-ASCIIMark Longair2013-10-04-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under Ruby 1.8, it was previously impossible to use one of the "first letter" alphabet links on the public body listing page if the first letter was outside [A-Za-z] since the test for the parameter only being a single letter wasn't aware of the possibly of multi-byte characters. In addition, upcasing of letters outside [A-Za-z] didn't work because String#upcase in Ruby 1.8 isn't Unicode-aware. This commit fixes these two problems, so that non-US-ASCII first letter links will work under Ruby 1.8. (Fixes #1112.)
* | | Merge remote-tracking branch 'origin/radio-button-fix' into rails-3-developLouise Crow2013-10-04-1/+1
|\ \ \
| * | | Fix a radio button label when updating a request statusMark Longair2013-10-01-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clicking on the "This request requires administrator attention" label would actually select the "I've received an error message" option due to the label referring to the wrong input element. This change corrects the label. Thanks to Jedidiah Broadbent for spotting this bug. Fixes #1113
* | | | Remove important termsLouise Crow2013-10-04-3/+0
| |/ / |/| | | | | | | | | | | | | | These are only being rendered into a comment, and have been for a long time. They now appear to be causing problems with non-ascii characters in ruby 1.9, so drop them completely.
* | | Merge branch 'release/0.14' into rails-3-developLouise Crow2013-09-24-1/+2
|\ \ \ | | |/ | |/|
| * | Fix typorelease/0.14Louise Crow2013-09-24-1/+1
| | |
| * | Revert "No need to set permissions on file now."Louise Crow2013-09-19-0/+1
| | | | | | | | | | | | | | | | | | In fact, we do still need to set permissions. This reverts commit 56ce526acdcb1b5493bc11f14b751b5c3f02f686.
* | | Handle salutations with regexp special characters.Louise Crow2013-09-19-1/+1
|/ / | | | | | | Fixes #1104.
* | Remove extra "is invalid" message.Louise Crow2013-09-18-1/+1
| | | | | | | | Fixes #1101.
* | Make favicon its own partialLouise Crow2013-09-18-1/+2
| | | | | | | | | | This is something you should be able to override without having to take on the maintenance of your own layout.
* | Merge branch 'hotfix/0.13.0.3' into rails-3-developLouise Crow2013-09-18-3/+12
|\ \
| * | Restrict old_unclassified methods to normal prominence.0.13.0.3hotfix/0.13.0.3Louise Crow2013-09-18-3/+12
| | | | | | | | | | | | Fixes #1082.
* | | Merge branch 'feature/hide-individual-responses' into rails-3-developLouise Crow2013-09-17-595/+741
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Use 403, not 410, for hidden items.Louise Crow2013-09-16-2/+2
| | | | | | | | | | | | | | | | | | | | As @mhl points out, this more clearly indicates that they may come back at some point.
| * | | No need to set permissions on file now.Louise Crow2013-09-16-1/+0
| | | | | | | | | | | | | | | | | | | | Either rails or the webserver will be sending it, we're not redirecting anymore.
| * | | Add message index to attachment filesLouise Crow2013-09-16-1/+3
| | | | | | | | | | | | | | | | | | | | So that files attached to different messages with the same name and url_part don't get overwritten.
| * | | Point admin link to incoming message admin interface.Louise Crow2013-09-16-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add the 'Actions' to the incoming message admin - now that this has both this and the prominence form, it seems like the logical place to link to from the main request page.
| * | | Exclude hidden responses when calculating old_unclassifiedLouise Crow2013-09-16-4/+14
| | | | | | | | | | | | | | | | | | | | Make old_unclassified_params method consistent with last_public_response_event and associated methods.
| * | | Only include public messages in who_can_followup_toLouise Crow2013-09-16-0/+2
| | | |
| * | | Add public criteria for message event access methodsLouise Crow2013-09-16-23/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Shorter way of getting text template.Louise Crow2013-09-16-1/+1
| | | |
| * | | Hide hidden outgoing messages in download.Louise Crow2013-09-16-9/+11
| | | |
| * | | Add prominence fields and cache expiry to outgoing adminLouise Crow2013-09-16-7/+36
| | | |
| * | | InfoRequestEvent.indexed_by_search consults OutgoingMessage.Louise Crow2013-09-16-0/+3
| | | |
| * | | Move indexed_by_search to MessageProminenceLouise Crow2013-09-16-4/+0
| | | | | | | | | | | | | | | | Add some tests that it's working on the outgoing message model.
| * | | Add hidden messages for outgoing message.Louise Crow2013-09-16-30/+39
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/request/_incoming_correspondence.html.erb
| * | | Create MessageProminence module.Louise Crow2013-09-16-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | At least some of the logic for incoming and outgoing message prominence is going to be identical, so move it to a module they can both include and use.