Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'add-installability-badge' into rails-3-develop | Louise Crow | 2014-08-22 | -0/+1 |
|\ | ||||
| * | Add badge pointing to our installability standards. | Louise Crow | 2014-08-07 | -0/+1 |
| | | ||||
* | | Merge branch 'issues/1647-cap-thin-support' into rails-3-develop | Louise Crow | 2014-08-22 | -7/+11 |
|\ \ | ||||
| * | | Fix typo | Louise Crow | 2014-08-22 | -1/+1 |
| | | | ||||
| * | | fixup! Use service for stop, start, restart | Louise Crow | 2014-08-21 | -2/+2 |
| | | | ||||
| * | | Use service for stop, start, restart | Louise Crow | 2014-08-21 | -7/+11 |
| | | | ||||
* | | | Merge branch 'remove-glibc-patch' into rails-3-develop | Louise Crow | 2014-08-22 | -7/+1 |
|\ \ \ | ||||
| * | | | Remove glibc patch | Louise Crow | 2014-08-21 | -7/+1 |
|/ / / | | | | | | | | | | Should now be patched in squeeze..thought patched in 2.11.3-1, actually patched in 2.11.3-4 http://metadata.ftp-master.debian.org/changelogs//main/e/eglibc/eglibc_2.11.3-4_changelog | |||
* | | | Merge branch 'issues/1505-nav-browse-requests' into rails-3-develop | Gareth Rees | 2014-08-21 | -85/+87 |
|\ \ \ | |/ / |/| | | ||||
| * | | Use existing "View Requests" key for "Browse Requests" | Gareth Rees | 2014-08-21 | -82/+82 |
| | | | | | | | | | | | | Also for "View and search requests" --> "Browse and search requests" | |||
| * | | Reword View Requests to Browse Requests in nav | Gareth Rees | 2014-08-21 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | User testing highlighted that it was easy to mistake "View Requests" for a Facebook-style wall rather than the list of all requests. [1] [1] https://github.com/mysociety/alaveteli/issues/1505 | |||
* | | | Clean up fuzzy translations. | Louise Crow | 2014-08-21 | -6/+3 |
| | | | ||||
* | | | Merge branch 'consistent-init-script-names' into rails-3-develop | Louise Crow | 2014-08-21 | -6/+6 |
|\ \ \ | ||||
| * | | | fixup! Have install script use same init script names as manual install docs. | Louise Crow | 2014-08-21 | -2/+2 |
| | | | | ||||
| * | | | fixup! Have install script use same init script names as manual install docs. | Louise Crow | 2014-08-21 | -1/+1 |
| | | | | ||||
| * | | | Have install script use same init script names as manual install docs. | Louise Crow | 2014-08-21 | -4/+4 |
| | | | | ||||
| * | | | Use init script names that match examples in documentation at alaveteli.org | Louise Crow | 2014-08-21 | -2/+2 |
| | | | | ||||
* | | | | Merge branch 'rails-3-develop' of ↵ | Louise Crow | 2014-08-21 | -806/+945 |
|\ \ \ \ | | |/ / | |/| | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop | |||
| * | | | Merge branch 'issues/1181-destroy-external-request' into rails-3-develop | Gareth Rees | 2014-08-21 | -1/+8 |
| |\ \ \ | ||||
| | * | | | Interpolate rather than String#+ | Gareth Rees | 2014-08-18 | -1/+1 |
| | | | | | | | | | | | | | | | https://github.com/bbatsov/ruby-style-guide#concat-strings | |||
| | * | | | Use different flash for fully_destroy external InfoRequest | Gareth Rees | 2014-08-18 | -1/+8 |
| | |/ / | | | | | | | | | | | | | Uses a different flash message to avoid trying to fetch a non existent user record | |||
| * | | | Update translations | Gareth Rees | 2014-08-21 | -800/+924 |
| | | | | ||||
| * | | | Merge branch 'nginx-ssl' into rails-3-develop | Gareth Rees | 2014-08-21 | -0/+7 |
| |\ \ \ | ||||
| | * | | | redirect HTTP to HTTPS in nginx SSL config | Gareth Rees | 2014-08-21 | -0/+7 |
| | | | | | ||||
| * | | | | Merge branch 'issues/1744-view-as-html-stylesheet' into rails-3-develop | Gareth Rees | 2014-08-21 | -5/+6 |
| |\ \ \ \ | | |/ / / | |/| | | | ||||
| | * | | | Add charset to view-as-html template | Gareth Rees | 2014-08-19 | -0/+2 |
| | | | | | ||||
| | * | | | Add charset to view-as-html stylesheet links | Gareth Rees | 2014-08-18 | -5/+4 |
| | |/ / | ||||
* | | | | Merge branch 'nginx-config-tweaks' into rails-3-develop | Louise Crow | 2014-08-21 | -3/+5 |
|\ \ \ \ | |/ / / |/| | | | ||||
| * | | | Remove static error page config. | Louise Crow | 2014-08-21 | -3/+0 |
| | | | | | | | | | | | | | | | | We don't have static error pages available in alaveteli | |||
| * | | | Add download location | Louise Crow | 2014-08-21 | -0/+5 |
| | | | | ||||
* | | | | Merge branch 'issues/1389-public-body-updates-spam' into rails-3-develop | Gareth Rees | 2014-08-21 | -2/+41 |
|\ \ \ \ | ||||
| * | | | | Add honeypot spam protection to body update form | Gareth Rees | 2014-08-21 | -2/+41 |
| | |/ / | |/| | | | | | | | | | | | | | | Intercepts the request and redirects to the homepage if the comment field is filled in on the public body update form. | |||
* | | | | Update NewRelic gem | Gareth Rees | 2014-08-21 | -1/+1 |
| |/ / |/| | | ||||
* | | | Merge branch 'rails-3-develop' of ↵ | Louise Crow | 2014-08-21 | -0/+0 |
|\ \ \ | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop | |||
| * | | | Rename nginx ssl config file | Gareth Rees | 2014-08-20 | -0/+0 |
| |/ / | | | | | | | Use .example to avoid conflicts with internal deployment system | |||
* | | | Merge branch 'add-lockfile-progs-to-packages' into rails-3-develop | Louise Crow | 2014-08-21 | -0/+4 |
|\ \ \ | |/ / |/| | | ||||
| * | | Add lockfile-progs to dependencies. | Louise Crow | 2014-08-19 | -0/+4 |
|/ / | | | | | | | Required since 3e9aca9c0795a205b4afe069ddd403889b95ffd2. | |||
* | | Fix httpd vhost example not sourcing conf files | Gareth Rees | 2014-08-18 | -1/+1 |
| | | ||||
* | | Merge branch 'customisable-vagrant-box' into rails-3-develop | Gareth Rees | 2014-08-18 | -3/+97 |
|\ \ | ||||
| * | | Add -y option to install python-software-properties | Gareth Rees | 2014-08-18 | -1/+1 |
| | | | ||||
| * | | Install the tools to install the tools! | Gareth Rees | 2014-08-18 | -0/+1 |
| | | | ||||
| * | | Use our own Launchpad Ubuntu repo to get pdftk | Louise Crow | 2014-08-18 | -6/+11 |
| | | | ||||
| * | | Precise specific fixes | Gareth Rees | 2014-08-18 | -1/+33 |
| | | | | | | | | | | | | | | | - Get bundler and pdftk from raring repo and de-prioritise all other raring packages | |||
| * | | Use official Canonical Ubuntu Precise image | Gareth Rees | 2014-08-13 | -1/+1 |
| | | | | | | | | | | | | Better source and includes curl | |||
| * | | Update commonlib | Gareth Rees | 2014-08-13 | -0/+0 |
| | | | ||||
| * | | Add script to test vagrant vm provisioning | Gareth Rees | 2014-08-13 | -0/+19 |
| | | | | | | | | | | | | - e.g. script/test-vagrant-provisioning squeeze64 | |||
| * | | Debian specific fixes | Gareth Rees | 2014-08-13 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | - Add wheezy repo to get bundler package which is unavailable in squeeze repo - Get bundler from wheezy repo and de-prioritise all other wheezy packages | |||
| * | | Update commonlib | Gareth Rees | 2014-08-08 | -0/+0 |
| | | | ||||
| * | | Use curl instead of wget in Vagrantfile | Gareth Rees | 2014-08-08 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use curl instead of wget in Vagrantfile to fetch the install script due to a bug in the default version of wget on Debian Squeeze. Fixes https://github.com/mysociety/alaveteli/issues/1691 > wget debian packages prior to 1.14-1 don't have SNI [1] support so the > webserver don't know which ssl certificate needs to use > > – https://github.com/Hexxeh/rpi-update/issues/65#issuecomment-13332143 | |||
| * | | Add customisable OS to Vagrantfile | Gareth Rees | 2014-08-08 | -2/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Choose the OS you want to run with the ALAVETELI_VAGRANT_OS environment variable. Examples: # Use default (Ubuntu 12.04 LTS (precise) vagrant up # Use Debian (7) Wheezy ALAVETELI_VAGRANT_OS=wheezy64 vagrant up |