aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Update translations after re-pulling from Transfix + cleaningrelease/0.15Mark Longair2013-11-08-246/+113
| | | | | | | | | | | | | As suggested in the release manager's checklist, this commit introduces the results of re-pulling from transifex: tx pull -a -f ... and cleaning the .po files again: bundle exec rake gettext:clean ... which removes the fuzzy strings from the repository.
* Fix a syntax error in locale/sr@latin/app.poMark Longair2013-11-08-4/+1
|
* Fix a syntax error in locale/bg/app.poMark Longair2013-11-08-3/+1
|
* Updated .po files and the .pot file with 'rake gettext:find'Mark Longair2013-11-08-384/+625
|
* Update translatable columnsMark Longair2013-11-08-2/+1
|
* cy (Welsh) locale: fix various problemsMark Longair2013-11-08-81/+81
| | | | | | | | | | | | The latest updates had several problems, which are fixed in this commit, e.g. * Malformed links * Broken uses of variables (e.g. translating the 'date' in '{{date}}') Additionally, I've stripped unnecessary space around many HTML tags that may cause the text rendering to look odd.
* cy (Welsh) locale: fix a link element's nameMark Longair2013-11-08-1/+1
|
* cy (Welsh) locale: fix capitalization of USER_NAMEMark Longair2013-11-08-3/+3
|
* Update with the latest translations from TransifexMark Longair2013-11-08-2213/+5663
|
* Merge branch 'feature/1118-fix-ask-us-to-add-links' into rails-3-developMark Longair2013-11-07-13/+28
|\
| * Show 'browse all' and 'ask us to add' one for authority only search.Louise Crow2013-11-07-0/+7
| | | | | | | | | | This is for the case where there are no results and the user was explicitly searching for authorities.
| * Don't show sorting links when there are no results.Louise Crow2013-11-07-1/+1
| |
| * Don't show link for browsing bodiesLouise Crow2013-11-07-2/+0
| | | | | | | | | | | | The context here is that bodies have merely been included in the search - it hasn't been explicitly restricted to bodies. So the links don't really make sense.
| * Show highlights and correction regardless of search type.Louise Crow2013-11-07-8/+20
| | | | | | | | Contributes to #1118.
| * Add 'browse all' and 'ask us to add' to authority search.Louise Crow2013-11-07-3/+1
| | | | | | | | | | This is the template used when the user is searching for a public body specifically to make a request to.
* | Switch .tx/config to refer to transifex.com instead of transifex.netMark Longair2013-11-07-1/+1
| | | | | | | | | | | | | | | | | | | | The transifex-client version 0.9.1 rejects the transifex.net URL, with the following error: CertificateError: hostname 'www.transifex.net' doesn't match either of '*.transifex.com', 'transifex.com' ... so update it to transifex.com.
* | Merge branch 'install-script' into rails-3-developMark Longair2013-11-07-87/+737
|\ \
| * | Set 'constraint_disabling: false' for tests in database.ymlMark Longair2013-11-07-0/+1
| | | | | | | | | | | | | | | Without this setting, the PostgreSQL user still has to be a superuser for the tests to work without constraint disabling errors.
| * | Add a Vagrantfile to use the install script in a Vagrant boxMark Longair2013-11-07-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be used with: vagrant --no-color up ... which (after some time) will leave you with a running site at: http://alaveteli.10.10.10.30.xip.io Many thanks to Simon Coffey (@urbanautomaton) and Chris Adams (@mrchrisadams) who produced a working Vagrantfile with a independent install script while our installation script work was ongoing - their advice and that script were very helpful for creating this Vagrantfile that uses our generic mySociety installation script.
| * | Rename /etc/postfix/regexp to /etc/postfix/transportsMark Longair2013-11-07-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | This seems slightly less confusing, since both this file and /etc/postfix/recipients contain regexp patterns. This also switches to replacing any transport_maps file that was in use and overwrites the existing file rather than modifying it.
| * | Reduce "backscatter" bounce risk by setting local_recipient_mapsMark Longair2013-11-07-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leaving the local_recipient_maps setting empty has a risk which is described in the Postfix manual: "[...] That is, an empty value. With this setting, the Postfix SMTP server will not reject mail with "User unknown in local recipient table". Don't do this on systems that receive mail directly from the Internet. With today's worms and viruses, Postfix will become a backscatter source: it accepts mail for non-existent recipients and then tries to return that mail as "undeliverable" to the often forged sender address." This commit changes the local_recipient_maps setting to only accept (and potentially bounce) emails where the local part is known (one that we've mentioned in general.yml) or to a Unix user that exists. Fixes #1166
| * | Invoke commands as the unprivileged user in a login shellMark Longair2013-11-07-3/+3
| | | | | | | | | | | | | | | | | | | | | On some setups, the unprivileged user's .bashrc file won't be sourced unless you've started a login shell - we need that to be sourced to add the gem's bin directory to the PATH, or "bundle" won't be found, for example.
| * | Use a more recent rubygems from squeeze-backportsMark Longair2013-11-07-1/+1
| | | | | | | | | | | | | | | | | | The version of rubygems in squeeze is old enough that it won't work with our Gemfile / Gemfile.lock. Fortunately, the one in squeeze-backports seems to work OK.
| * | Update INSTALL.md with details of the AMI and install scriptMark Longair2013-11-07-20/+140
| | | | | | | | | | | | | | | These instructions are heavily based on those written by me and @dracos for FixMyStreet and MapIt.
| * | Remove make-crontab and update INSTALL.mdMark Longair2013-11-07-18/+14
| | | | | | | | | | | | | | | | | | The make-crontab script is now redundant, so instead direct people to use the config_files:convert_crontab rake task for generating a crontab file.
| * | Make X-Accel-Redirect work with the example nginx configMark Longair2013-11-07-0/+7
| | |
| * | nginx: root should be the public directory so that try_files worksMark Longair2013-11-07-1/+1
| | |
| * | Add a rake task to rewrite the crontab-example fileMark Longair2013-11-07-4/+23
| | | | | | | | | | | | | | | | | | As suggested by Louise Crow, this new rake task reuses the convert_ugly function to rewrite the crontab-example file into a usable crontab file.
| * | Fix an undefined variable errorMark Longair2013-11-07-6/+2
| | | | | | | | | | | | | | | I assume 'skip' must have been an argument to this function before it was introduced into our repository.
| * | Switch to using 'rake config_files:convert_init_script'Mark Longair2013-11-07-6/+3
| | | | | | | | | | | | | | | | | | Rather than reimplement the processing of the ugly file with sed, we can use the existing rake task for rewriting config/alert-tracks-debian.ugly.
| * | If the origin/install-script branch exists, use that in preferenceMark Longair2013-11-07-7/+4
| | | | | | | | | | | | | | | | | | Once merged to master we can remove origin/install-script, but development is awkward without it. This commit also makes it easy to have an arbitrary number of fallbacks.
| * | crontab-example: use !!(*= .vhost_dir *)!! to avoid '/data/vhost/'Mark Longair2013-10-31-13/+13
| | | | | | | | | | | | | | | | | | This is so that we can rewrite the crontab-example file into a real crontab on systems where the prefix for virtual host directories is something other than '/data/vhost'.
| * | We don't use foi-purge-varnish ourselves, so remove itMark Longair2013-10-31-7/+1
| | | | | | | | | | | | | | | | | | We had various problems with the foi-purge-varnish script ourselves that led to us removing it, so it seems like a bad idea to be implicitly suggesting that others should use it.
| * | Drop PostgreSQL superuser permissions after loading sample dataMark Longair2013-10-31-0/+6
| | |
| * | Add install scripts for AlaveteliMark Longair2013-10-31-0/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | site-specific-install.sh will be called by our generic site install script in commonlib/bin/install-site.sh These scripts assume that you have a new installation of Debian squeeze or Ubuntu precise and then will set up: - Alaveteli running in development mode with the Thin web server behing nginx - The cron jobs that are required for the site to work. - A basic Postfix configuration for sending and receiving mail. We also will use this script for generating new AMIs (Amazon Machin Images) for Alaveteli. The general.yml configuration file will be created if it doesn't exist, but if there is an existing copy it won't be overwritten, so it should be safe to customize that file and then re-run the install script.
| * | Exit quietly from purge-varnish-debian if varish is not installedMark Longair2013-10-29-0/+2
| | |
| * | Add a config option for whether to use mailcatcher in developmentMark Longair2013-10-29-3/+13
| | | | | | | | | | | | | | | Sometimes it's useful to be able to really send mail in development mode, so add a config option for that.
| * | Deal with ../logs existing, and log not being a symlinkMark Longair2013-10-29-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rails-post-deploy script would error if the log directory existed (rather than being a symlink to another directory, for example) and the ../logs directory also existed. This commit changes this behaviour to move the existing log directory out of the way in this case. In addition, this commit switches from removing the old symlink and creating a new one (which creates a gap in time during which the log directory doesn't exist) to using "ln -snf" to just overwrite any existing symlink or file. (Note that this is still not an atomic operation, but it's bound to leave less time between removal and creation.)
| * | Normalize whitespace in rails-post-deployMark Longair2013-10-29-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | The rails-post-deploy script unfortunately uses a mixtures of spaces and 0x09 to represent indentation, so it's not even clear what local convention to follow. It appears from the mixture that the intention is that the tabs should represent 4 spaces, so this commit replaces them, strips trailing whitespace and changes some non-standard indentation at the end of a bash heredoc.
| * | Add a sysvinit script for starting ThinMark Longair2013-10-29-0/+53
| | | | | | | | | | | | This is a sample sysvinit script to start Thin in development mode.
| * | Add the Thin web server to the GemfileMark Longair2013-10-29-0/+2
| | | | | | | | | | | | | | | | | | | | | Thin is a reasonable choice for a production server for a Rails app behind nginx, which is the configuration that the Alaveteli install script will use. Thin is also the preferred server for local development in Rails 3.2 and later.
| * | Add an example nginx.confMark Longair2013-10-29-0/+22
| | | | | | | | | | | | | | | | | | This example nginx.conf file may be helpful for running Alaveteli behind nginx - we have tested this with Thin as the upstream server.
| * | Add package lists for Ubuntu precise and Debian squeezeMark Longair2013-10-29-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The config/packages file cannot be used as a list of packages to give to apt-get install - its format is designed to be used as build-dependencies of a fake Debian package. These distribution- and release-specific new files, on the other hand, provide a list of packages that should satisfy the config/packages requirements on Ubuntu precise or Debian squeeze. The generic site install file will use files like these on the matching distribution and release.
* | | Merge branch 'rails-3-develop' of ↵Louise Crow2013-11-07-122/+385
|\ \ \ | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * \ \ Merge branch 'public-body-stats-fixes' into rails-3-developMark Longair2013-11-07-122/+385
| |\ \ \ | | |_|/ | |/| |
| | * | Don't include public bodies tagged 'test' in public body statisticsMark Longair2013-11-07-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the initial release of public body statistics to WhatDoTheyKnow a public body only intended for testing ("mySociety Test Quango") was included in the statistics. This commit causes public bodies tagged with "test" to be excluded from the public body statistics page. Fixes #1115.
| | * | Factor out code for generating graphable data and add testsMark Longair2013-11-05-23/+135
| | | | | | | | | | | | | | | | | | | | | | | | This simplifies the statistics action of the PublicBodyController and makes it easier to test the functionality now in the simplify_stats_for_graphs method.
| | * | Fix the indentation of a PublicBodyController testMark Longair2013-11-05-28/+28
| | | |
| | * | Update the calculation of the numerator for percentage statisticsMark Longair2013-11-05-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have changed the denominator of the proportion-based statistics to only include requests that are both visible and not 'awaiting_description'. This would mean, however, that the numerator could be larger than the denominator. This commit updates the calculation of those statistics to also exclude any hidden or unclassified requests.
| | * | Add "(n)" to the tooltips on the stats graphsMark Longair2013-11-05-3/+6
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-22 13:18:13 +0000