aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Results of running rake gettext:store_model_attributesLouise Crow2015-03-24-4/+0
| | | | | Also manual removal of identity card number attribute which had crept in from a theme.
* Result of running rake gettext:update_msgids_from_csvLouise Crow2015-03-24-1200/+1200
| | | | | | | | | Mapping file https://gist.github.com/crowbot/76f706150a3ee3754212 We're running this as we've made a few text tweaks as part of revising the process of making a new request - some of these are just rephrasings so we don't want to require all translators to retranslate them.
* Latest translations from Transifex.Louise Crow2015-03-24-586/+4452
|
* Update newrelic_rpmLouise Crow2015-03-24-1/+1
|
* Update to latest version of commonlibLouise Crow2015-03-24-0/+0
|
* Merge branch '1472-simpler-external-process-management' into rails-3-developLouise Crow2015-03-24-37/+54
|\
| * Handle a child that cannot be terminated.Louise Crow2015-03-23-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basic handling that is the same as for other process errors - just write to stderr. Add TODO for allowing the calling code to specify an error stream to allow other handling. In different circumstances, the calling code might want to raise an exception, write to the log, or do something else. At the moment this code assumes a cron context and writes to stderr, which will cause an email to be sent from the cron process, but that's not always the context the calling code is being run in. So we may be missing errors that are, for example, being written to stderr during the request cycle. In fact, this code may be called from the same place with different contexts (i.e. as part of a cron reindexing task and in the request cycle), so at the moment some substantial refactoring of the calling code would be required to make sure calls to this code handle errors appropriately for each context.
| * Give messages standard start text.Louise Crow2015-03-23-3/+3
| | | | | | | | To make it easier to find them in other output.
| * Update commonlib to get changes for simpler external process handlingLouise Crow2015-03-23-0/+0
| |
| * Set options via options hash only.Louise Crow2015-03-23-23/+11
| |
| * Add a default timeout of 20 mins to external commands.Louise Crow2015-03-23-1/+3
| |
| * Give a forced timeout its own error message.Louise Crow2015-03-23-2/+11
| | | | | | | | Clarify grouping of command and arguments with quotes.
| * Separate flags for binary input and outputLouise Crow2015-03-23-3/+8
| | | | | | | | | | There may be cases where the input is binary but the output is encoded text.
| * Allow options hash to be passed to ExternalCommand.Louise Crow2015-03-23-2/+3
| | | | | | | | Document :timeout as a possible option key.
| * Factor out find_program method.Louise Crow2015-01-27-13/+14
| |
| * Use open4 gem.Louise Crow2015-01-27-0/+3
| | | | | | | | | | Open4 seems to have the best support across versions of ruby http://ku1ik.com/2010/09/18/open3-and-the-pid-of-the-spawn.html
* | Merge branch 'translation-script' into rails-3-developLouise Crow2015-03-23-1/+46
|\ \
| * | Add rake task for uppdating locale files with slightly changed msgidsLouise Crow2015-03-23-1/+46
| | | | | | | | | | | | | | | | | | We don't really want to make all the translators retranslate strings that are basically the same but slightly tweaked in the English version. So this task just replaces the msgid in the app.po files for each locale.
* | | Merge remote-tracking branch ↵Gareth Rees2015-03-20-729/+2065
|\ \ \ | | | | | | | | | | | | 'origin/2140-translations-failed-validation-r3d' into rails-3-develop
| * | | Make sure fields with errors are highlighted in the default locale.Louise Crow2015-03-18-0/+12
| | | |
| * | | Highlight fields with errors in the admin interface.Louise Crow2015-03-18-0/+8
| | | |
| * | | Fix translating Public Body HeadingsGareth Rees2015-03-18-184/+683
| | | | | | | | | | | | | | | | | | | | Fixes submission of form containing both existing and new translations
| * | | Fix translating Public Body CategoriesGareth Rees2015-03-18-207/+886
| | | |
| * | | Fix translating Public BodiesGareth Rees2015-03-18-338/+476
|/ / /
* | | Merge branch 'schlos-patch-1' into rails-3-developGareth Rees2015-03-18-1/+1
|\ \ \
| * | | Update Croatian languageMiroslav2015-03-17-1/+1
|/ / / | | | | | | Just updating to first caps to match GUI context
* | | Merge branch '2163-deploy-restart-daemon' into rails-3-developGareth Rees2015-03-17-6/+24
|\ \ \ | |/ / |/| |
| * | Add deploy daemon_name upgrade notesGareth Rees2015-03-09-0/+7
| | |
| * | Improve checking whether the daemon can runGareth Rees2015-03-09-1/+7
| | | | | | | | | | | | | | | | | | | | | Only `su` to the app user if the app user is not running the script. If the app user is running the script, its unlikely they'll have sudo permissions so the `su` call prompts for a password.
| * | Create daemons with correct permissionsGareth Rees2015-03-09-3/+5
| | | | | | | | | | | | | | | The app user needs to be able to restart the app because of the current capistrano setup. The deploy user should not really be the app runner.
| * | Restart alaveteli by service commandGareth Rees2015-03-09-2/+5
| | | | | | | | | | | | | | | - daemon_name defaults to "alaveteli" - daemon_name can be set per-environment in config/deploy.yml
* | | Remove migration script.Louise Crow2015-03-13-4/+0
|/ / | | | | | | Other code for this data migration was removed in e6511423e9334973ecd8d808c3b73c1b4e312935.
* | Merge branch '2165-compact-xapian-restart' into rails-3-developGareth Rees2015-03-09-5/+8
|\ \
| * | Add compact Xapian crontab upgrade notesGareth Rees2015-03-09-0/+5
| | |
| * | Add optional daemon_name parameterGareth Rees2015-03-09-2/+3
| | | | | | | | | | | | For hosts with multiple alaveteli services
| * | Restart alaveteli rather than apacheGareth Rees2015-03-09-5/+2
|/ /
* | Merge branch 'vagrant-performance' into rails-3-developGareth Rees2015-03-09-0/+11
|\ \
| * | Give VirtualBox access to all host CPU coresGareth Rees2015-02-16-0/+11
| | | | | | | | | | | | via https://stefanwrobel.com/how-to-make-vagrant-performance-not-suck
* | | Merge branch 'add_pry' into rails-3-developGareth Rees2015-03-09-0/+9
|\ \ \
| * | | Add pry to development gemsGareth Rees2015-02-10-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pry is awesome. The main reason to add it to the Gemfile is to use `binding.pry` in views and controllers. TL;DR is that it halts execution and opens a REPL for you to dig around at the current variables at the point of the binding. See Railscast #280 [1] for a quick overview. 0.9 seems to be the last version to support Ruby 1.8 [1] http://railscasts.com/episodes/280-pry-with-rails
* | | | Merge branch '59-localised-authority-links' into rails-3-developLouise Crow2015-03-05-138/+120
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/public_body/show.html.erb
| * | | | Use routing helper to generate localised urls.Louise Crow2015-03-05-99/+120
| | | | |
| * | | | Remove 'html' param.Louise Crow2015-03-05-51/+12
| | | | | | | | | | | | | | | | | | | | | | | | | There's only one call to this function in the rest of the code. That has 'html' set to true.
* | | | | Merge branch '2178-improve-batch-sent-notice' into rails-3-developLouise Crow2015-03-05-17/+56
|\ \ \ \ \
| * | | | | Use new styling for batch request sent panel.Louise Crow2015-03-03-15/+54
| | | | | |
| * | | | | Make notice about override work with batch requests.Louise Crow2015-03-03-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | They don't have a public body, so use the config param directly.
* | | | | | Merge branch 'remove-public-body-categories' into rails-3-developLouise Crow2015-03-05-158/+0
|\ \ \ \ \ \
| * | | | | | Remove deprecated code. Fixes #2015.Louise Crow2015-02-26-158/+0
| | |/ / / / | |/| | | |
* | | | | | Add some more detailed release notes.Louise Crow2015-03-03-14/+43
| |/ / / / |/| | | |
* | | | | Exclude .bundle from coverage reports.Louise Crow2015-03-02-0/+1
| | | | |