Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Symlink the theme directory on Capistrano deploys | Henare Degan | 2015-04-28 | -0/+8 |
| | | | | | | This effectively caches themes for faster and smaller deploys. After the first deploy the themes will only need a Git update and all deploys will share a common Git repositories for the themes. | |||
* | Delete .cvsignore | Gareth Rees | 2015-04-28 | -5/+0 |
| | ||||
* | Merge remote-tracking branch 'github/garethrees-patch-2' into rails-3-develop | Gareth Rees | 2015-04-28 | -3/+0 |
|\ | ||||
| * | Delete .cvsignore | Gareth Rees | 2015-04-28 | -3/+0 |
|/ | ||||
* | Merge branch 'fix-alert-daemon-restart' into rails-3-develop | Louise Crow | 2015-04-28 | -2/+2 |
|\ | ||||
| * | Use a retry option when stopping daemons. | Louise Crow | 2015-04-28 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | This checks whether the process has actually stopped before continuing. A value of 5 specifies that processes will be given 5 seconds to terminate after the first TERM signal has been issued, then another 5 seconds after a KILL command before the function will return an error. http://manpages.ubuntu.com/manpages/trusty/man8/start-stop-daemon.8.html | |||
* | | Merge branch 'add-widget' into rails-3-develop | Louise Crow | 2015-04-28 | -3/+609 |
|\ \ | |/ |/| | ||||
| * | Use a boolean operator - 'and' and 'or' are for control flow. | Louise Crow | 2015-04-28 | -1/+1 |
| | | ||||
| * | Use || - 'and' and 'or' are for control flow, not logical operators | Louise Crow | 2015-04-28 | -1/+1 |
| | | ||||
| * | Use factory for widget vote | Louise Crow | 2015-04-28 | -1/+8 |
| | | ||||
| * | Move existing track logic to controller | Louise Crow | 2015-04-28 | -7/+6 |
| | | ||||
| * | Move vote calculation to controller. | Louise Crow | 2015-04-28 | -2/+2 |
| | | ||||
| * | Use status value from controller. | Louise Crow | 2015-04-28 | -25/+21 |
| | | ||||
| * | Clean up first_or_create call. | Louise Crow | 2015-04-28 | -1/+3 |
| | | ||||
| * | Add some notes on usage. | Louise Crow | 2015-04-28 | -0/+3 |
| | | ||||
| * | Use a helper to generate the status text. | Louise Crow | 2015-04-28 | -35/+79 |
| | | | | | | | | | | | | | | | | This has length constraints, so we don't want to directly use InfoRequest.get_status_description (which also adds a full stop), but we want statuses that more closely correspond to get_status_description than those in the template, which are used in AskTheEU. | |||
| * | Add height to stop long text overflowing. | Louise Crow | 2015-04-28 | -0/+1 |
| | | ||||
| * | Tweak widget size, add border. | Louise Crow | 2015-04-28 | -2/+3 |
| | | ||||
| * | Add closing tags for iframes. | Louise Crow | 2015-04-28 | -2/+2 |
| | | ||||
| * | Make scss, add custom hook. | Louise Crow | 2015-04-28 | -4/+1 |
| | | ||||
| * | Don't capitalize the label | Louise Crow | 2015-04-28 | -0/+1 |
| | | ||||
| * | Move styling out of translatable text as much as possible. | Louise Crow | 2015-04-28 | -6/+5 |
| | | ||||
| * | Add a wrapper | Louise Crow | 2015-04-28 | -12/+10 |
| | | | | | | | | | | We don't want to set absolute tops on the count and people in case they swap around when translated to other languages. | |||
| * | Add text for people wanting to know | Louise Crow | 2015-04-28 | -3/+4 |
| | | ||||
| * | Use title case - upcasing done in stylesheet. | Louise Crow | 2015-04-28 | -16/+16 |
| | | ||||
| * | Add status label | Louise Crow | 2015-04-28 | -0/+1 |
| | | ||||
| * | Remove Open Sans font import | Louise Crow | 2015-04-28 | -1/+0 |
| | | ||||
| * | New styling from @martinwright | Louise Crow | 2015-04-28 | -14/+78 |
| | | ||||
| * | Don't show the widget pages for requests without normal prominence. | Louise Crow | 2015-04-28 | -1/+39 |
| | | ||||
| * | Add link to create widget if widgets are enabled. | Louise Crow | 2015-04-28 | -0/+5 |
| | | ||||
| * | Validate the uniqueness of cookies within the scope of info requests. | Louise Crow | 2015-04-27 | -0/+17 |
| | | ||||
| * | Don't set 'same origin' policy for widget iframes. | Louise Crow | 2015-04-27 | -0/+6 |
| | | | | | | | | | | Whilst this is a good security precaution in general, we want people to display these widgets in iframes on other sites. | |||
| * | Allow widgets to be controlled with a feature flag. | Louise Crow | 2015-04-27 | -1/+49 |
| | | ||||
| * | Trim down styling, use classes, and clearer BEM-style naming. | Louise Crow | 2015-04-27 | -74/+26 |
| | | ||||
| * | Use resource-based RESTful routing and separate controller | Louise Crow | 2015-04-27 | -144/+160 |
| | | ||||
| * | Add some specs for the vote tracking action. | Louise Crow | 2015-04-27 | -3/+49 |
| | | ||||
| * | Add some specs for widget vote validation. | Louise Crow | 2015-04-27 | -0/+37 |
| | | ||||
| * | Add some controller specs for widget actions. | Louise Crow | 2015-04-27 | -0/+60 |
| | | ||||
| * | Show "votes" along with tracks in widget | Jody McIntyre | 2015-04-27 | -1/+1 |
| | | ||||
| * | Add controller for non-logged in "voting" | Jody McIntyre | 2015-04-27 | -6/+23 |
| | | ||||
| * | Send widget_vote cookie when user not logged in | Jody McIntyre | 2015-04-27 | -0/+4 |
| | | ||||
| * | Add model to track "votes" for a request | Jody McIntyre | 2015-04-27 | -0/+30 |
| | | ||||
| * | Don't open the request in the widget iframe | Jody McIntyre | 2015-04-23 | -1/+1 |
| | | ||||
| * | Center count text | Jody McIntyre | 2015-04-23 | -0/+2 |
| | | ||||
| * | Add link to widget | Jody McIntyre | 2015-04-23 | -1/+5 |
| | | ||||
| * | Add widget for info requests | Jody McIntyre | 2015-04-23 | -0/+211 |
| | | ||||
* | | Merge branch 'rails-3-develop' of ↵ | Louise Crow | 2015-04-27 | -32/+84 |
|\ \ | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop | |||
| * \ | Merge branch 'hotfix/0.21.0.23' into rails-3-develop | Gareth Rees | 2015-04-27 | -24/+32 |
| |\ \ | ||||
| | * | | Bump alaveteli versionhotfix/0.21.0.23 | Gareth Rees | 2015-04-27 | -1/+1 |
| | | | | ||||
| | * | | Tidy InfoRequest#initial_request_text | Gareth Rees | 2015-04-27 | -5/+2 |
| | | | |