| Commit message (Collapse) | Author | Age | Lines |
| |
|
|
|
|
| |
We default MTA_LOG_TYPE to exim so we can set the default log path too
|
|
|
|
|
|
| |
We supply a default example for MAX_REQUESTS_PER_USER_PER_DAY so we
might as well set it as default and allow the user to tune if they
dislike the default.
|
|
|
|
|
|
| |
All our examples use the 'foi+' prefix so lets make this the default. If
people _really_ want no prefix, they can change the setting to ''. This
will probably cover the more general cases.
|
|
|
|
|
| |
156481f set the default example to true but this ensures the fallback is
true.
|
|
|
|
| |
Sets viewport, uses responsive header and footer templates.
|
| |
|
| |
|
|
|
|
|
| |
Sometimes it's useful to be able to really send mail in development
mode, so add a config option for that.
|
|\
| |
| |
| |
| |
| |
| | |
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.
|
| |
|
|
|
|
| |
update config to avoid redefinition of constant warnings.
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
Gemfile
Gemfile.lock
app/views/admin_request/show.html.erb
config/environment.rb
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
Gemfile
Gemfile.lock
app/controllers/admin_request_controller.rb
app/controllers/admin_track_controller.rb
app/controllers/request_controller.rb
app/controllers/services_controller.rb
app/helpers/link_to_helper.rb
app/mailers/request_mailer.rb
app/models/application_mailer.rb
app/models/info_request.rb
app/views/admin_censor_rule/edit.html.erb
app/views/admin_censor_rule/new.html.erb
app/views/admin_public_body/_form.html.erb
app/views/admin_public_body/_locale_selector.html.erb
app/views/admin_public_body/_one_list.html.erb
app/views/admin_public_body/edit.html.erb
app/views/admin_public_body/list.html.erb
app/views/admin_public_body/new.html.erb
app/views/admin_request/_incoming_message_actions.html.erb
app/views/admin_request/edit.html.erb
app/views/admin_request/edit_comment.html.erb
app/views/admin_request/edit_outgoing.html.erb
app/views/admin_request/list.html.erb
app/views/admin_request/list_old_unclassified.html.erb
app/views/admin_request/show.html.erb
app/views/admin_track/_some_tracks.html.erb
app/views/admin_track/list.html.erb
app/views/admin_user/edit.html.erb
app/views/admin_user/list.html.erb
app/views/admin_user/show.html.erb
app/views/general/_footer.html.erb
app/views/general/exception_caught.html.erb
app/views/help/contact.html.erb
app/views/layouts/default.html.erb
app/views/public_body/_alphabet.html.erb
app/views/request/_request_listing_single.html.erb
app/views/request/_sidebar.html.erb
app/views/request/new.html.erb
app/views/request/show.html.erb
app/views/request_mailer/external_response.rhtml
app/views/request_mailer/fake_response.rhtml
config/environment.rb
config/environments/production.rb
config/routes.rb
spec/controllers/admin_censor_rule_controller_spec.rb
spec/controllers/request_controller_spec.rb
spec/controllers/track_controller_spec.rb
spec/helpers/link_to_helper_spec.rb
spec/mailers/request_mailer_spec.rb
spec/models/info_request_spec.rb
spec/spec_helper.rb
spec/views/public_body/show.html.erb_spec.rb
spec/views/request/show.html.erb_spec.rb
vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
Gemfile.lock
|
| | | |
|
| |/ |
|
| | |
|
| | |
|
|/ |
|
|
|
|
| |
to appear in URLs generated by the application.
|
| |
|
| |
|
| |
|
|\
| |
| |
| | |
feature/nils_in_config
|
| |
| |
| |
| |
| |
| | |
Because of the way that rblib/config.rb works, nil for these values would always raise an exeption (see line 209) so changing it to an empty string seems better.
It fixes my problem where I purposely didn't define HTML_TO_PDF_COMMAND anyway.
|
|/ |
|
|
|
|
| |
to deliver and receive our mail
|
|\
| |
| |
| | |
develop
|
| |
| |
| |
| | |
Back in 008e64e7 it was changed so that you could just set a blank value instead of '/admin/', it looks like test.yml was never updated and somehow lib/configuration.rb started off with the old value too.
|
|/ |
|
| |
|
|
|