| Commit message (Collapse) | Author | Age | Lines |
|\
| |
| |
| |
| | |
Conflicts:
config/initializers/alaveteli.rb
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|/
|
|
| |
http://seclists.org/oss-sec/2013/q4/118
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Precise is now the long term maintenance version, and has a more
up-to-date package of rubygems available.
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| | |
We want to be able to authorise access to it.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
We'll use this for saving the changes to the prominence of an incoming
message in a relatively RESTful url structure.
|
| | |
|
| |
| |
| |
| |
| | |
Make specs that depend on multiple controllers and models interacting
integration specs.
|
| |
| |
| |
| | |
Eventually this should use standard RESTful routing.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
app/controllers/public_body_controller.rb
config/general.yml-example
lib/configuration.rb
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \ |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
This adds the MINIMUM_REQUESTS_FOR_STATISTICS config option.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
|\ \ \ |
|
| |/ / |
|
|/ /
| |
| |
| | |
They are depended on by nokogiri, depended on in turn by webrat.
|
|/ |
|
|
|
|
| |
outside initialization e.g. in tests.
|
| |
|
|
|
|
|
|
| |
default to HTML. Fixes #989."
This reverts commit c1b3324922687778b316ee1a180582013bcf6d0e.
|
| |
|
|
|
|
| |
HTML. Fixes #989.
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
into rails-3-develop
Conflicts:
app/controllers/application_controller.rb
app/controllers/general_controller.rb
config/routes.rb
|
| |
| |
| |
| | |
Implements #834
|
| |
| |
| |
| | |
flexibility in running multiple instances on a server.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
version 0.5. Closes #972.
|
|\ \ |
|
| |\ \
| | | |
| | | |
| | | | |
ssh://git.mysociety.org/data/git/public/alaveteli into release/0.11
|
| | |\ \ |
|
| |/ / / |
|
| | | | |
|
| | | | |
|