aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| | | * Fix 'doc' link — it goes to ↵Tony Bowden2012-02-04-1/+1
| | | | | | | | | | | | | | | | https://github.com/sebbacon/alaveteli/alaveteli/doc/ which doesn't exist
| | | * Merge branch 'release/0.5'Robin Houston2012-02-03-7472/+17917
| | | |\ | | | |/ | | |/|
| | * | Make variables localRobin Houston2012-02-03-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The variables last_request_id and last_body_id were not used by the view, so it’s clearer to make them local variables so it’s obvious from the controller code which values influence the rendering.
| | * | *Do* strip country detection cookies in varnishSeb Bacon2012-02-03-1/+1
| | | |
| | * | Merge branch 'release/0.5' of github.com:sebbacon/alaveteli into release/0.5Seb Bacon2012-02-03-1/+16
| | |\ \
| | | * \ Merge branch 'wdtk' into release/0.5Robin Houston2012-02-03-1/+16
| | | |\ \
| | | | * | Add --log optionRobin Houston2012-02-03-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to log the output of failed pairs, so we have some hope of determining the cause of failure in cases where it does not turn out to be reproducible.
| | * | | | Don't strip last_seen_* cookies. Fixes #405Seb Bacon2012-02-03-1/+1
| | |/ / /
| | * | | Fix namespace problem in i18n interpolationSeb Bacon2012-02-02-2/+2
| | | | |
| | * | | Latest POT file for 0.5 releaseSeb Bacon2012-02-02-55/+65
| | | | |
| | * | | New improved find-msgids-and-make-pot-file rake task:Seb Bacon2012-02-02-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | (a) it doesn't do fuzzy matches (apparently Transifex does that for you) (b) it doesn't update all the PO files too (which certainly Transifex does for you)
| | * | | Merge branch 'release/0.5' of github.com:sebbacon/alaveteli into release/0.5Seb Bacon2012-02-02-210/+138
| | |\| |
| | | * | Get rid of config/rails_env.rbRobin Houston2012-02-02-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rails-post-deploy script was creating a file config/rails_env.rb to force $RAILS_ENV to have the appropriate value. But this is a huge pain during development, and shouldn’t be necessary anyway, so let’s get rid of it.
| | | * | Remove trailing whitespaceRobin Houston2012-02-02-1/+1
| | |/ / | |/| |
| * | | Merge branch 'wdtk' into release/0.5Robin Houston2012-02-01-182/+137
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: locale/app.pot
| | * | | TypoRobin Houston2012-02-01-1/+1
| | | | |
| | * | | issue #351 reduxRobin Houston2012-02-01-5/+45
| | | | | | | | | | | | | | | | | | | | Corrected diagnosis, test & fix for issue #351. Fixes #351.
| | * | | typoRobin Houston2012-02-01-1/+1
| | | | |
| | * | | Revert small unintended changeRobin Houston2012-02-01-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert a small part of 33f8ef66084bbfb61bf0b4e0f53e1da5e7cc84dc, which was not intended, so that the behaviour is unchanged if a xapian database doesn’t exist, say.
| | * | | Close xapian db before opening it againRobin Houston2012-01-31-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This *ought* to fix the problem with the alert-tracks daemon opening more and more copies of the xapian db till it exhausts the available file descriptors.
| | * | | Update testRobin Houston2012-01-31-1/+1
| | | | | | | | | | | | | | | | | | | | Update test to take account of change 76fd5f9.
| | * | | Suppress stderr output from rake db:test:prepareRobin Houston2012-01-31-1/+1
| | | | |
| | * | | Keep message text if user is rate-limitedRobin Houston2012-01-31-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a user cannot make new requests because they are rate-limited, and they compose a request whilst logged out, include the text of the request in the message that explains about the rate limit so it is not lost.
| | * | | Use db:test:prepare to prepare the way for testsRobin Houston2012-01-31-2/+1
| | | | |
| | * | | Change (Banned) to (Account suspended)Robin Houston2012-01-31-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user account has been suspended, we write (Banned) after their user name. But sometimes we need to suspend accounts temporarily, such as pending the result of a discussion, and it is misleading to write (Banned) in such cases; so let’s change it to (Account suspended) instead.
| | * | | Load all fixtures for all testsRobin Houston2012-01-31-145/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ad hoc specification of fixtures has been an ongoing source of bugs in the tests. The straw that broke the camel’s back is that 7c6eb09 requires the fixtures to be loaded in order (i.e. children before their parents), and it would have been a painful process to reorder all the dozens of different fixture lists, but the test system ought to be more reliable this way.
| | * | | Avoid need to be db superuser to run testsRobin Houston2012-01-31-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Add a patch from louisecrow (https://github.com/mysociety/fixmytransport/blob/master/lib/patches/fixtures_constraint_disabling.rb) that makes it possible to run the tests without being a database superuser.
| | * | | fix shell syntax in scriptRobin Houston2012-01-31-2/+2
| | | | |
| | | * | Remove WDTK-specific categories from core Alaveteli. Replace with ↵Seb Bacon2012-02-02-79/+15
| | | | | | | | | | | | | | | | | | | | categories that work with the sample data.
| | | * | Mention where a theme is installed.Seb Bacon2012-02-02-0/+4
| | |/ / | |/| |
| * | | Update translations (preparing for new release)Seb Bacon2012-02-01-1933/+2724
| | | |
| * | | Tweak translations documentationSeb Bacon2012-02-01-6/+9
| | | |
| * | | Merge branch 'issue_393' of https://github.com/henare/alaveteli into release/0.5Seb Bacon2012-01-31-3/+12
| |\ \ \
| | * | | Fixes #393 - Route the mass_assign_tags action so it does what it says on ↵Henare Degan2012-01-31-1/+10
| | | | | | | | | | | | | | | | | | | | the tin
| | * | | Controller tests were failing for these actions - switching to more concise ↵Henare Degan2012-01-31-2/+2
| |/ / / |/| | | | | | | | | | | URL helpers seemed to fix things up
* | | | Merge branch 'release/0.5' into developRobin Houston2012-01-29-170/+656
|\ \ \ \
* \ \ \ \ Merge branch 'release/0.5' into developRobin Houston2012-01-27-266/+420
|\ \ \ \ \
* \ \ \ \ \ Merge branch 'release/0.5' into developRobin Houston2012-01-26-246/+258
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge branch 'release/0.5' into developRobin Houston2012-01-23-70/+306
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge branch 'release/0.5' into developRobin Houston2012-01-17-94/+6408
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/alaveteli_external_command.rb
* \ \ \ \ \ \ \ \ Merge branch 'release/0.5' into developRobin Houston2012-01-17-53/+160
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge branch 'release/0.5' into developRobin Houston2012-01-12-8/+11
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge branch 'release/0.5' into developRobin Houston2012-01-12-0/+7
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release/0.5' into developRobin Houston2012-01-12-45/+104
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release/0.5' into developRobin Houston2012-01-11-39/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/wdtk' into developRobin Houston2012-01-09-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release/0.5' into developRobin Houston2012-01-09-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release/0.5' into developRobin Houston2012-01-09-11/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release/0.5' into developRobin Houston2012-01-09-13/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release/0.5' into developSeb Bacon2012-01-09-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \