| 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
|
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
|/ |
|
|
|
|
| |
outside initialization e.g. in tests.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
We believe that this customization is no longer needed, and
in any case would need to be rewritten for will_paginate 3.0.4.
If any pagination bugs do arise, a test should be added that
reproduces that problem, since currently the tests pass without
this extension.
|
|\
| |
| |
| |
| |
| |
| |
| | |
This merge brings in a number of tests and fixes for the handling
of mail under Mail / Rails 3 instead of TMail / Rails 2.
Conflicts:
config/initializers/alaveteli.rb
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Throughout the codebase it is simplest and most consistent
if we could assume that all text/* attachments are represented
by UTF-8 strings, and this was largely true with the TMail
backend which ensured that all returned text parts were in
UTF-8. We have to change the replacement Mail-backed to
similarly attempt to convert text parts to UTF-8. This commit
introduces two functions which are useful for this.
The normalize_string_to_utf8 function will try various
encodings, either suggested or guessed (with charlock_holmes)
to convert the passed string to UTF-8, and if it can't find a
suitable encoding will throw an exception.
Unfortunately, the current behaviour of the site is that
uninterpretable text/* attachments are still passed around and
mangled to UTF-8 just before display. To mimic this it's also
useful to have the convert_string_to_utf8_or_binary function,
which tries to convert the string to UTF-8 with
normalize_string_to_utf8, but if that's not possible just
returns the original string. (In Ruby 1.9, encoding will be
set to UTF-8 or ASCII-8BIT appropriately.)
|
|/
|
|
| |
param 'constraint_disabling' is set to false in the test section of database.yml, and pay attention to the order in which fixtures are defined when deleting and loading them.
|
|\
| |
| |
| | |
into rails-3-develop
|
| | |
|
|/
|
|
| |
of Alaveteli.
|
|
|
|
|
|
|
|
|
|
| |
One of the mechanisms by which the correct version of a theme
to use is chosen is by checking whether there's a tag in the
the theme repository that matches the ALAVETELI_VERSION.
Since the themes need to have code changes for Rails 3, it
makes sense to define a version number to be the first Rails 3
version so that we can work on this branch and have working
versions of themes installed.
|
|\
| |
| |
| |
| |
| | |
Conflicts:
config/environment.rb
spec/mailers/track_mailer_spec.rb
|
|\ \
| | |
| | |
| | | |
rails-3-develop
|
| | |
| | |
| | |
| | | |
configuration setting)
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| | |
Conflicts:
Gemfile
Gemfile.lock
app/views/admin_request/show.html.erb
config/environment.rb
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
correctly implemented
|
| | |
|
| |
| |
| |
| | |
commandline. Also, monkeypatch not needed anymore
|
| |
| |
| |
| | |
anymore
|
| |
| |
| |
| | |
causing problems in the test
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|/ |
|
|
|
|
| |
session in the case where the default locale is not being included in URLs. This allows the user to return to the default locale.
|
|
|
|
| |
to appear in URLs generated by the application.
|
| |
|
| |
|