| Commit message (Collapse) | Author | Age | Lines | |
|---|---|---|---|---|
| * | List private methods in the order they’re calledrelease-0-22-fix-widget | Gareth Rees | 2015-06-29 | -4/+4 |
| | | | | | Easier to read through as they’re now in the order called in the before_filter | |||
| * | Use link_to helper for consistency | Gareth Rees | 2015-06-29 | -2/+2 |
| | | ||||
| * | Use named route to generate update track URL | Gareth Rees | 2015-06-29 | -2/+2 |
| | | ||||
| * | Fix positioning of link | Gareth Rees | 2015-06-29 | -1/+1 |
| | | | | | Without the `alaveteli-widget__button` class the link was at the very top of the widget, rather than at the bottom left. | |||
| * | Extract WidgetsController#update to WidgetVotesController#create | Gareth Rees | 2015-06-29 | -107/+149 |
| | | | | | | The action is creating a WidgetVote resource, so should be in WidgetVotesController#create. A “Widget” is not the same concept as a WidgetVote. | |||
| * | Remove unused route | Gareth Rees | 2015-06-29 | -1/+0 |
| | | | | I think this got extracted to WidgetsController#update | |||
| * | Extract mock cookie value to method | Gareth Rees | 2015-06-29 | -11/+13 |
| | | ||||
| * | Clear old WidgetVotes when converted to TrackThing | Gareth Rees | 2015-06-29 | -0/+42 |
| | | | | | | | | When a User signs in to confirm their WidgetVote, a TrackThing is created. This leads to the vote being double-counted as the WidgetVote is not cleared. Fixes https://github.com/mysociety/alaveteli/issues/2601 | |||
| * | Show already tracking confirmation | Gareth Rees | 2015-06-29 | -0/+6 |
| | | | | | | | | If a WidgetVote exists for the user’s widget_vote cookie, show them that they have already voted for the request. Use the link to the track path so that a TrackThing gets created if they sign up/sign in. | |||
| * | Set widget_vote cookie on update instead of show | Gareth Rees | 2015-06-29 | -13/+25 |
| | | | | | A user hasn’t expressed any interest in the request just by viewing the widget, so don’t set the tracking cookie. | |||
| * | Improve specs for creating a WidgetVote | Gareth Rees | 2015-06-29 | -12/+20 |
| | | | | Better context blocks now spec file has grown | |||
| * | Add test for tallying request follow count | Gareth Rees | 2015-06-26 | -0/+22 |
| | | ||||
| * | Add tests for finding exiting TrackThing | Gareth Rees | 2015-06-26 | -0/+31 |
| | | ||||
| * | Assign the widget_vote cookie if available | Gareth Rees | 2015-06-26 | -7/+22 |
| | | | | Reorganised the specs a little in to better contexts | |||
| * | Unify widgets not enabled spec description | Gareth Rees | 2015-06-26 | -3/+3 |
| | | ||||
| * | Unify WidgetControllerSpec action descriptions | Gareth Rees | 2015-06-26 | -3/+3 |
| | | ||||
| * | Use correct HTTP verb for WidgetsController#update | Gareth Rees | 2015-06-26 | -6/+6 |
| | | ||||
| * | Destroy associated widget_votes | Gareth Rees | 2015-06-26 | -1/+8 |
| | | | | | | Prevents orphan widget_votes existing when the parent InfoRequest is destroyed. | |||
| * | Group and describe destroy specs | Gareth Rees | 2015-06-26 | -31/+33 |
| | | ||||
| * | Merge branch 'develop' into release-22-develop | Gareth Rees | 2015-06-24 | -1340/+735 |
| |\ | ||||
| | * | Merge branch 'upgrade-jquery-rails' into develop | Louise Crow | 2015-06-23 | -1026/+74 |
| | |\ | ||||
| | | * | Remove local version of jquery-ui stylesheet | Louise Crow | 2015-06-17 | -375/+0 |
| | | | | | | | | | | | | | Should be served by jquery-ui-rails. | |||
| | | * | Fix issue that was preventing preview from displaying properly. | Louise Crow | 2015-06-17 | -1/+1 |
| | | | | ||||
| | | * | Update JCrop js for latest jquery. | Louise Crow | 2015-06-17 | -45/+55 |
| | | | | ||||
| | | * | Update jquery.Jcrop | Louise Crow | 2015-06-17 | -202/+12 |
| | | | | | | | | | | | | | Old version was calling some outdating jquery methods. | |||
| | | * | fixup! Remove jquery and jquery-ui. | Louise Crow | 2015-06-17 | -1/+1 |
| | | | | ||||
| | | * | Update .live() to .on() | Louise Crow | 2015-06-17 | -2/+2 |
| | | | | | | | | | | | | | Required now we're using the latest version of jquery in the admin interface. | |||
| | | * | Remove jquery and jquery-ui. | Louise Crow | 2015-06-17 | -397/+0 |
| | | | | | | | | | | | | | These should be provided by jquery-ui-rails. | |||
| | | * | Update jquery-rails to get the fix for CVE-2015-1840. | Louise Crow | 2015-06-17 | -3/+3 |
| | | | | ||||
| | * | | Merge branch 'add-rbenv-comment-to-httpd-conf' into develop | Louise Crow | 2015-06-23 | -0/+4 |
| | |\ \ | ||||
| | | * | | Add a line to httpd.conf to show how to use with rbenv | Louise Crow | 2015-06-23 | -0/+4 |
| | |/ / | ||||
| | * | | Code markup | Louise Crow | 2015-06-23 | -3/+3 |
| | | | | ||||
| | * | | Add upgrade notes for latest changes | Louise Crow | 2015-06-23 | -3/+18 |
| | | | | | | | | | | | | | CVE fixes, ruby migration examples and FoiAttachment body encoding. | |||
| | * | | Merge branch 'add-rbenv-shims' into develop | Louise Crow | 2015-06-23 | -0/+36 |
| | |\ \ | ||||
| | | * | | Add conversion task for config/run-with-rbenv-path.example | Louise Crow | 2015-06-23 | -0/+16 |
| | | | | | ||||
| | | * | | Add example of wrapper script used to run mailin and handlemail. | Louise Crow | 2015-06-23 | -0/+8 |
| | | | | | ||||
| | | * | | Add some commented out lines showing how to use with rbenv | Louise Crow | 2015-06-19 | -0/+12 |
| | | | | | ||||
| | * | | | Merge branch 'fix-bad-encodings' into develop | Louise Crow | 2015-06-23 | -0/+96 |
| | |\ \ \ | ||||
| | | * | | | Add script to detect poorly encoded UTF-8 in existing data. | Louise Crow | 2015-06-23 | -0/+96 |
| | |/ / / | ||||
| | * | | | Merge branch 'binary-or-utf8-attachment-bodies' into develop | Louise Crow | 2015-06-23 | -135/+235 |
| | |\ \ \ | ||||
| | | * | | | Use existing UTF-8 conversion method. | Louise Crow | 2015-06-22 | -10/+1 |
| | | | | | | ||||
| | | * | | | Remove redundant UTF-8 conversion. | Louise Crow | 2015-06-22 | -65/+1 |
| | | | | | | | | | | | | | | | | | | | | | body_as_text has already been converted and scrubbed if needed. | |||
| | | * | | | Add body_as_text, default_body. | Louise Crow | 2015-06-22 | -16/+101 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main intent here is to be more explicit about what form you're getting the attachment body in - valid UTF-8 or binary, and has it been cleaned up in order to be UTF-8? | |||
| | | * | | | convert_string_to_utf8 returns struct of string and scrubbing status. | Louise Crow | 2015-06-22 | -11/+23 |
| | | | | | | ||||
| | | * | | | Clearly separate text attachments and binary. | Louise Crow | 2015-06-22 | -6/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Text type attachments will always have a UTF-8 body (even if it has to be scrubbed). | |||
| | | * | | | Round trip through utf-16 to clean utf-8 string | Louise Crow | 2015-06-22 | -9/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | As noted in the ruby docs (http://ruby-doc.org/core-1.9.3/String.html#method-i-encode), any conversion from an encoding to the same encoding is a no-op, covert it first to utf-16. | |||
| | | * | | | Use ASCII-8BIT for replacement patterns when handling binary data. | Louise Crow | 2015-06-22 | -23/+74 |
| | | | | | | | | | | | | | | | | | | | | | Also be explicit about using UTF-8 when handling text data. | |||
| | * | | | | Merge branch 'add-rack-sanitizer-via-platform' into develop | Louise Crow | 2015-06-22 | -5/+3 |
| | |\ \ \ \ | ||||
| | | * | | | | Use :platform to add rack-utf8_sanitizer | Louise Crow | 2015-06-19 | -5/+3 |
| | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, the conditional used in 090531bf2d2b763e5bb281658e91b58905912130 results in `Gemfile.lock` being inconsistent with `Gemfile` under ruby 1.8.7 so we can't use it until after Alaveteli release 0.22, which is the last release that will support ruby 1.8.7. | |||
| | * | | | | Merge branch 'use-bash-source-in-mail-scripts' into develop | Louise Crow | 2015-06-22 | -2/+2 |
| | |\ \ \ \ | ||||
