aboutsummaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeLines
* Merge branch 'switch-theme-script' into rails-3-developMark Longair2013-10-30-2/+2
|\ | | | | | | | | Conflicts: config/initializers/alaveteli.rb
| * Make theme URL to theme name mapping consistentMark Longair2013-10-15-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that extracted the theme name from each entry in THEME_URLS (in order to require code from a directory whose leaf name is the theme name) only supported git URLs that ended in '.git'. However, the themes:install rake task usefully supports a wider range of git URLs - for example, all of the following were supported: /home/whoever/themes/blah-theme => blah-theme /home/whoever/themes/blah-theme/ => blah-theme git://wherever/blah-theme.git => blah-theme ssh://wherever/blah-theme.git// => blah-theme This commit factors out a theme_url_to_theme_name method, adds tests for it, and uses that method in both: lib/tasks/themes.rake config/initializers/theme_loader.rb ... so that a wider range of theme URLs are consistently supported.
* | Monkey patch actionmailer for CVE-2013-43890.14.0.3hotfix/0.14.0.3Louise Crow2013-10-24-0/+1
|/ | | | http://seclists.org/oss-sec/2013/q4/118
* Bump Alaveteli versionLouise Crow2013-09-24-1/+1
|
* Merge branch 'feature/hide-individual-responses' into rails-3-developLouise Crow2013-09-17-12/+29
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile app/views/admin_request/edit_outgoing.html.erb config/packages doc/CHANGES.md doc/INSTALL.md spec/models/info_request_spec.rb spec/models/public_body_spec.rb
| * Assume Ubuntu 12.04 (precise) not 10.04 (lucid)Louise Crow2013-09-16-1/+0
| | | | | | | | | | Precise is now the long term maintenance version, and has a more up-to-date package of rubygems available.
| * Specify a later version of rubygemsLouise Crow2013-09-16-1/+1
| | | | | | | | | | | | | | | | Version 1.8.15 from backports should not have the Syck bug described here: http://stackoverflow.com/questions/9004804/invalid-gemspec-illformed-requirement-yamlsyckdefaultkey0xb5f9c990-3 http://blog.rubygems.org/2011/08/31/shaving-the-yaml-yak.html
| * Add some upgrade notes.Louise Crow2013-09-16-0/+10
| |
| * Create MessageProminence module.Louise Crow2013-09-16-0/+1
| | | | | | | | | | | | At least some of the logic for incoming and outgoing message prominence is going to be identical, so move it to a module they can both include and use.
| * Don't make zip dir publicly accessible.Louise Crow2013-09-16-1/+0
| | | | | | | | We want to be able to authorise access to it.
| * Extract out code for making a request summary fileLouise Crow2013-09-16-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Render the show template within the current thread rather than making another request - we're going to need to use the current session in order to know what do include in the zip file, now that we have more fine-grained visibility of messages. Also, this will mean we can use this functionality in single threaded contexts, and test it more easily. Don't display profile photos as this would require another process, and hide other icons so we don't need to include them. Use render_to_string as a more standard way of rendering templates to a string for further manipulation.
| * Add a simple edit action and templateLouise Crow2013-09-16-0/+1
| |
| * Shorter route names and pathsLouise Crow2013-09-16-6/+6
| |
| * Add incoming message update action and route.Louise Crow2013-09-16-0/+1
| | | | | | | | | | We'll use this for saving the changes to the prominence of an incoming message in a relatively RESTful url structure.
| * Slightly nicer action names.Louise Crow2013-09-16-2/+2
| |
| * Move incoming message admin to its own controller.Louise Crow2013-09-16-2/+5
| | | | | | | | | | Make specs that depend on multiple controllers and models interacting integration specs.
| * Move outgoing message admin actions to their own controller.Louise Crow2013-09-16-3/+6
| | | | | | | | Eventually this should use standard RESTful routing.
* | Merge branch 'public-body-locale-fallback' into rails-3-developLouise Crow2013-09-12-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/public_body_controller.rb config/general.yml-example lib/configuration.rb
| * | Make falling back to default locale in public body listings optionalMark Longair2013-09-10-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the code stood, the list method in PublicBodyController would only return results that had translations of the public body in the default locale. This has a variety of problems if you're viewing pages in the non-default locale - for example, the "first letter" links wouldn't bring up the public bodies that began with that letter in the current locale, only those that began with it in the default locale. Ideally, every public body would be translated into every available locale for the site, but there are cases where deployers wish to have public body listings also include those from the default locale, in case there are untralsated public bodies: https://groups.google.com/d/msg/alaveteli-dev/zUY_USaAMAM/M7KTQ9RC5YUJ This commit makes the default behaviour to look for public body listings only in the current locale, but if the new configuration option PUBLIC_BODY_LIST_FALLBACK_TO_DEFAULT_LOCALE is set, then public body listings will be looked for in both the current locale and the default locale. Fixes #1000
* | | Syntax fix.Louise Crow2013-09-05-1/+1
| | |
* | | Add update of body stats to example cron file.Louise Crow2013-09-05-0/+2
| | |
* | | Remove obsolete comment.Louise Crow2013-09-05-1/+0
| | |
* | | Merge branch 'body-statistics' into rails-3-developLouise Crow2013-09-04-0/+9
|\ \ \
| * | | Add a config option to enable the public body statistics pageMark Longair2013-08-20-0/+4
| | | |
| * | | Make the minimum requests for statistics configurableMark Longair2013-08-20-0/+4
| | | | | | | | | | | | | | | | This adds the MINIMUM_REQUESTS_FOR_STATISTICS config option.
| * | | Add a page with experimental statistics on public bodiesMark Longair2013-08-20-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The statistics on the status of the requests to a particular public body are too slow to calculate on-the-fly, so this commit adds: * Extra columns on public_bodies to store counts of the successful, not held, and overdue request counts for each public body. * A rake task which should be run periodically to update the overdue request count column. If Javascript is not available, the summary statistics are shown as tables. If Javascript is available, graphs are drawn with Flot.
* | | | Serve admin.js as a static fileMark Longair2013-08-21-1/+0
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | admin.js was being generated from a view so that the config variable ADMIN_PUBLIC_URL could be used to direct AJAX requests in the admin interface correctly. ADMIN_PUBLIC_URL was necessary for WhatDoTheyKnow when the admin interface was proxied over SSL, while the rest of the site was non-SSL. Now that the whole site is served over SSL, however, the proxy for the admin interface is not longer used and ADMIN_PUBLIC_URL / ADMIN_BASE_URL have been removed. As a result, admin.js is now being generated from a Rails view unnecessarily, and at some performance cost. This commit moves admin.coffee and admin.js to the public directory, so they will be served more efficiently. In addition, this commit removes admin.coffee / admin.js from public/javascripts/ where there was a second (and different) version that now appears to be unused.
* | | Merge branch 'release/0.13' into rails-3-developLouise Crow2013-08-20-1/+1
|\ \ \
| * | | Bump application version.Louise Crow2013-08-15-1/+1
| |/ /
* / / Add libxml2-dev and libxslt-devLouise Crow2013-08-19-0/+2
|/ / | | | | | | They are depended on by nokogiri, depended on in turn by webrat.
* / add wheezy package names as alternates for rdoc and irbIan Chard2013-08-14-2/+2
|/
* Move some more config into AlaveteliLocalization so that it can be called ↵Louise Crow2013-07-24-3/+2
| | | | outside initialization e.g. in tests.
* Extract code for setting locales in FastGettext and I18nLouise Crow2013-07-18-8/+4
|
* Revert "Assume that format will be specified in the url requested, or ↵Louise Crow2013-06-26-5/+0
| | | | | | default to HTML. Fixes #989." This reverts commit c1b3324922687778b316ee1a180582013bcf6d0e.
* Bump version number to 0.12Louise Crow2013-06-25-1/+1
|
* Assume that format will be specified in the url requested, or default to ↵Louise Crow2013-06-20-0/+5
| | | | HTML. Fixes #989.
* Merge remote-tracking branch 'openaustralia_github/app_version_api_feature' ↵Louise Crow2013-06-18-0/+1
|\ | | | | | | | | | | | | | | | | into rails-3-develop Conflicts: app/controllers/application_controller.rb app/controllers/general_controller.rb config/routes.rb
| * Add publicly accesible json api to query alaveteli and ruby version. ↵Matthew Landauer2013-02-24-0/+1
| | | | | | | | Implements #834
* | Use daemon_name as service name rather than hardcoding to give more ↵Louise Crow2013-06-18-6/+6
| | | | | | | | flexibility in running multiple instances on a server.
* | Ignore a crontab file in the config directoryLouise Crow2013-06-18-0/+1
| |
* | Add a symlink to an httpd.conf file in the shared directory.Louise Crow2013-06-18-0/+1
| |
* | Move crontab.ugly to crontab-exampleLouise Crow2013-06-12-3/+3
| |
* | Allow the donation url to be configured. Closes #909.Louise Crow2013-06-07-0/+5
| |
* | Remove support for theme stylesheet inclusion via template deprecated in ↵Louise Crow2013-06-05-1/+0
| | | | | | | | version 0.5. Closes #972.
* | Merge branch 'release/0.11' into rails-3-developLouise Crow2013-06-04-2/+2
|\ \
| * \ Merge branch 'release/0.11' of ↵0.11Louise Crow2013-06-03-1/+1
| |\ \ | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into release/0.11
| | * \ Merge branch 'rails-3-develop' into release/0.11Mark Longair2013-05-30-1/+1
| | |\ \
| * | | | Bump version number.Louise Crow2013-06-03-1/+1
| |/ / /
| * | | Add note about config/httpd.confLouise Crow2013-05-30-1/+1
| | | |
* | | | We no longer run HTML validation as part of the test suite.Louise Crow2013-06-04-2/+1
| | | |