aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | Set locale in controller test by passing parameter in getMatthew Landauer2013-04-02-11/+7
| | | | | | | | | | | | Also using I18n.locale to pass the current locale around.
| * | bundle update fast_gettext gettext_i18n_rails gettext locale routing-filterMatthew Landauer2013-04-02-1/+1
| | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock
| * | Remove version restrictions on gems related to i18nMatthew Landauer2013-04-02-10/+10
| | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock
| * | Moved all gems related to i18n into one place in GemfileMatthew Landauer2013-04-02-5/+8
| | | | | | | | | | | | | | | | | | Conflicts: Gemfile
* | | Create a xapian database on Travis to fix a test failureMark Longair2013-04-04-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error in this case was: 1) RequestController when showing similar requests should work Failure/Error: get :similar, :url_title => info_requests(:badger_request).url_title RuntimeError: Failed to open Xapian database /home/travis/build/mysociety/alaveteli/vendor/plugins/acts_as_xapian/lib/../xapiandbs/test: DatabaseOpeningError: Couldn't stat '/home/travis/build/mysociety/alaveteli/vendor/plugins/acts_as_xapian/lib/../xapiandbs/test' This seems to be fixed by adding script/update-xapian-index to the setup on Travis.
* | | Remove superfluous leading './'sMark Longair2013-04-03-4/+4
| | | | | | | | | | | | | | | | | | | | | When running a script in another directory via a relative path it's not necessary to have a leading ./ regardless of your PATH. (At least that's is the case with bash, zsh, tcsh, csh and dash.)
* | | Bump ALAVETELI_VERSION to 0.10 (should be the first Rails 3 version)Mark Longair2013-04-03-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | script/plugin no longer exists in Rails 3Mark Longair2013-04-03-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead we should use "bundle exec rails plugin". The "-r rails-3" is to make sure that we get the Rails 3 version of the theme, i.e. one that uses Rails.root instead of RAILS_ROOT. (Unfortunately, it doesn't work specifying an annotated tag with "-r", so we use a branch name instead, say, of "use-alaveteli-0.10".)
* | | Enable rails-post-deploy to be run from any directoryMark Longair2013-04-02-2/+7
| | | | | | | | | | | | | | | | | | | | | The BASH_SOURCE variable reliably gives the path of the script, so we can make the script work regardless of what the current working directory is on running the script.
* | | Merge branch 'develop' into rails-3-developLouise Crow2013-04-02-0/+1
|\| |
| * | Include the rails-3-develop branch in CI testing.Louise Crow2013-04-02-0/+1
| | |
| * | Merge branch 'hotfix/0.8.0.1' into developLouise Crow2013-04-02-9/+32
| |\ \
* | \ \ Merge branch 'hotfix/0.8.0.1' into rails-3-developLouise Crow2013-04-02-10/+33
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: config/environment.rb spec/mailers/track_mailer_spec.rb
| * | | Merge remote-tracking branch 'openaustralia_github/https_in_emails' into ↵hotfix/0.8.0.1Louise Crow2013-04-02-7/+30
| |\ \ \ | | | | | | | | | | | | | | | hotfix/0.8.0.1
| | * | | When force_ssl is true make links in emails httpsMatthew Landauer2013-04-02-7/+30
| | |/ /
| * | | Merge remote-tracking branch 'openaustralia_github/email_alert_path_fixes' ↵Louise Crow2013-04-02-3/+3
| |\ \ \ | | | | | | | | | | | | | | | into hotfix/0.8.0.1
| | * | | Use full urls in outgoing_message_url as the name impliesMatthew Landauer2013-04-02-2/+2
| | |/ /
| * | | Merge branch 'release/0.8'0.8Louise Crow2013-03-19-6/+8
| |\ \ \
| * \ \ \ Merge branch 'release/0.8'Louise Crow2013-03-19-2235/+10709
| |\ \ \ \
| * \ \ \ \ Merge branch 'hotfix/0.7.0.5'Louise Crow2013-03-18-20/+20
| |\ \ \ \ \
* | \ \ \ \ \ Merge remote-tracking branch 'openaustralia_github/test_order_fixes' into ↵Louise Crow2013-03-28-0/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | rails-3-develop
| * | | | | | | Unraveled another test environment cleanup bug with config.order = random:33691Matthew Landauer2013-03-26-0/+13
| | | | | | | |
| * | | | | | | Fixup test issue found with config.order = 'random:5549'Matthew Landauer2013-03-26-0/+2
| | | | | | | |
* | | | | | | | Merge remote-tracking branch ↵Louise Crow2013-03-28-57/+55
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/small_source_code_header_fixups' into rails-3-develop
| * | | | | | | | Remove cvs tagMatthew Landauer2013-03-26-2/+0
| | | | | | | | |
| * | | | | | | | Change email address in header of source code to hello@mysociety.orgMatthew Landauer2013-03-26-55/+55
| |/ / / / / / /
* | | | | | | | Merge remote-tracking branch ↵Louise Crow2013-03-28-10/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/request_action_admin_fixes' into rails-3-develop
| * | | | | | | | Escaping fix in admin display of events params_yamlMatthew Landauer2013-03-28-1/+1
| | | | | | | | |
| * | | | | | | | Allow i18n of template email sent to users for vexatious requestsMatthew Landauer2013-03-28-6/+6
| | | | | | | | |
| * | | | | | | | Don't hardcode WhatDoTheyKnow.com in subject of email to usersMatthew Landauer2013-03-28-1/+1
| | | | | | | | |
| * | | | | | | | Fix link for showing user bounce messageMatthew Landauer2013-03-28-1/+1
| | | | | | | | |
| * | | | | | | | Forms were not being shown because using wrong form of erb blockMatthew Landauer2013-03-28-2/+2
| |/ / / / / / /
* | | | | | | | Merge remote-tracking branch ↵Louise Crow2013-03-28-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | 'openaustralia_github/configuration_class_renamed_fix' into rails-3-develop
| * | | | | | | The configuration class was previously renamed from Configuration to ↵Matthew Landauer2013-03-28-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | AlaveteliConfiguration
* | | | | | | Merge remote-tracking branch 'openaustralia_github/rails-3-develop' into ↵Louise Crow2013-03-21-11/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | rails-3-develop
| * | | | | | | We've already removed the proxied admin interface (and ADMIN_PUBLIC_URL ↵Matthew Landauer2013-03-20-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configuration setting)
* | | | | | | | Update Configuration references to new name.Louise Crow2013-03-19-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'develop' into rails-3-developLouise Crow2013-03-19-103/+141
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/views/admin_request/show.html.erb config/environment.rb
| * | | | | | Follow alphabetical ordering.Louise Crow2013-03-19-1/+1
| | | | | | |
| * | | | | | Merge branch 'release/0.8' into developLouise Crow2013-03-19-103/+140
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/he_IL/app.po locale/id/app.po
| | * | | | | Supply info request id in an HTML 5 data attributerelease/0.8Louise Crow2013-03-19-6/+8
| | | |_|/ / | | |/| | |
| | * | | | Bump version number to 0.8Louise Crow2013-03-19-1/+1
| | | | | |
| | * | | | Allow the emergency user account to be disabled.Louise Crow2013-03-19-4/+22
| | | | | |
| | * | | | Latest translations from Transifex.Louise Crow2013-03-19-93/+92
| | | | | |
| | * | | | Merge branch 'hotfix/0.7.0.5' into release/0.8Louise Crow2013-03-18-19/+20
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock locale/cy/app.po locale/fr/app.po locale/he_IL/app.po locale/id/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sr@latin/app.po locale/uk/app.po
| | * | | | Merge branch 'develop' into release/0.8Louise Crow2013-03-14-8/+14
| | |\ \ \ \
| | * | | | | Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117eLouise Crow2013-03-14-3/+3
| | | | | | |
| | * | | | | Add some release notes.Louise Crow2013-03-14-0/+17
| | | | | | |
| * | | | | | Merge branch 'hotfix/0.7.0.5' into developLouise Crow2013-03-18-19/+19
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock locale/cy/app.po locale/fr/app.po locale/he_IL/app.po locale/id/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sr@latin/app.po locale/uk/app.po
| | * | | | Upgrade to Rails 2.3.18 to get fixes for CVE-2013-1855, CVE-2013-1856, ↵hotfix/0.7.0.5Louise Crow2013-03-18-20/+20
| | | |/ / | | |/| | | | | | | | | | | | CVE-2013-1857.
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 04:30:05 +0000