aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* fixup! Use service for stop, start, restartLouise Crow2014-08-21-2/+2
|
* Use service for stop, start, restartLouise Crow2014-08-21-7/+11
|
* Clean up fuzzy translations.Louise Crow2014-08-21-6/+3
|
* Merge branch 'consistent-init-script-names' into rails-3-developLouise Crow2014-08-21-6/+6
|\
| * fixup! Have install script use same init script names as manual install docs.Louise Crow2014-08-21-2/+2
| |
| * fixup! Have install script use same init script names as manual install docs.Louise Crow2014-08-21-1/+1
| |
| * Have install script use same init script names as manual install docs.Louise Crow2014-08-21-4/+4
| |
| * Use init script names that match examples in documentation at alaveteli.orgLouise Crow2014-08-21-2/+2
| |
* | Merge branch 'rails-3-develop' of ↵Louise Crow2014-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-developGareth Rees2014-08-21-1/+8
| |\ \
| | * | Interpolate rather than String#+Gareth Rees2014-08-18-1/+1
| | | | | | | | | | | | https://github.com/bbatsov/ruby-style-guide#concat-strings
| | * | Use different flash for fully_destroy external InfoRequestGareth Rees2014-08-18-1/+8
| | |/ | | | | | | | | | Uses a different flash message to avoid trying to fetch a non existent user record
| * | Update translationsGareth Rees2014-08-21-800/+924
| | |
| * | Merge branch 'nginx-ssl' into rails-3-developGareth Rees2014-08-21-0/+7
| |\ \
| | * | redirect HTTP to HTTPS in nginx SSL configGareth Rees2014-08-21-0/+7
| | | |
| * | | Merge branch 'issues/1744-view-as-html-stylesheet' into rails-3-developGareth Rees2014-08-21-5/+6
| |\ \ \ | | |/ / | |/| |
| | * | Add charset to view-as-html templateGareth Rees2014-08-19-0/+2
| | | |
| | * | Add charset to view-as-html stylesheet linksGareth Rees2014-08-18-5/+4
| | |/
* | | Merge branch 'nginx-config-tweaks' into rails-3-developLouise Crow2014-08-21-3/+5
|\ \ \ | |/ / |/| |
| * | Remove static error page config.Louise Crow2014-08-21-3/+0
| | | | | | | | | | | | We don't have static error pages available in alaveteli
| * | Add download locationLouise Crow2014-08-21-0/+5
| | |
* | | Merge branch 'issues/1389-public-body-updates-spam' into rails-3-developGareth Rees2014-08-21-2/+41
|\ \ \
| * | | Add honeypot spam protection to body update formGareth Rees2014-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 gemGareth Rees2014-08-21-1/+1
| |/ |/|
* | Merge branch 'rails-3-develop' of ↵Louise Crow2014-08-21-0/+0
|\ \ | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * | Rename nginx ssl config fileGareth Rees2014-08-20-0/+0
| |/ | | | | Use .example to avoid conflicts with internal deployment system
* | Merge branch 'add-lockfile-progs-to-packages' into rails-3-developLouise Crow2014-08-21-0/+4
|\ \ | |/ |/|
| * Add lockfile-progs to dependencies.Louise Crow2014-08-19-0/+4
|/ | | | Required since 3e9aca9c0795a205b4afe069ddd403889b95ffd2.
* Fix httpd vhost example not sourcing conf filesGareth Rees2014-08-18-1/+1
|
* Merge branch 'customisable-vagrant-box' into rails-3-developGareth Rees2014-08-18-3/+97
|\
| * Add -y option to install python-software-propertiesGareth Rees2014-08-18-1/+1
| |
| * Install the tools to install the tools!Gareth Rees2014-08-18-0/+1
| |
| * Use our own Launchpad Ubuntu repo to get pdftkLouise Crow2014-08-18-6/+11
| |
| * Precise specific fixesGareth Rees2014-08-18-1/+33
| | | | | | | | | | - Get bundler and pdftk from raring repo and de-prioritise all other raring packages
| * Use official Canonical Ubuntu Precise imageGareth Rees2014-08-13-1/+1
| | | | | | | | Better source and includes curl
| * Update commonlibGareth Rees2014-08-13-0/+0
| |
| * Add script to test vagrant vm provisioningGareth Rees2014-08-13-0/+19
| | | | | | | | - e.g. script/test-vagrant-provisioning squeeze64
| * Debian specific fixesGareth Rees2014-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 commonlibGareth Rees2014-08-08-0/+0
| |
| * Use curl instead of wget in VagrantfileGareth Rees2014-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 VagrantfileGareth Rees2014-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
* | Merge branch 'nginx-config' into rails-3-developGareth Rees2014-08-18-13/+62
|\ \
| * | Use legacy alaveteli install path for nginx rootGareth Rees2014-08-18-5/+5
| | | | | | | | | | | | | | | | | | For backwards compatability with the install script, use PREFIX/HOST/SITE
| * | Don’t assume alaveteli is the default serverGareth Rees2014-08-18-1/+1
| | | | | | | | | | | | Can either be added manually (or by the install script) or nginx will default to this server if there are no others available
| * | Make setting the server_name a manual stepGareth Rees2014-08-18-1/+3
| | | | | | | | | | | | Interferes with the install script and the server will work without it providing it is the only server available
| * | Make nginx redirect server an exampleGareth Rees2014-08-18-4/+7
| | | | | | | | | | | | | | | | | | This is unusable with the install script as you can’t pass additional domains to it. Also makes the assumption that you’re using www. as the canonical domain name, which might not be the case if you were running alaveteli as as e.g. foi.example.org.
| * | Use legacy document rootGareth Rees2014-08-18-2/+2
| | | | | | | | | | | | Too difficult to change to FSH standard at this point
| * | Add nginx ssl config exampleGareth Rees2014-08-18-0/+32
| | |
| * | Add nginx custom logsGareth Rees2014-08-18-0/+3
| | |
| * | Add nginx server to redirect other domainsGareth Rees2014-08-18-0/+5
| | |