aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Display issue on request listsRobin Houston2012-05-25-2/+3
| | | | http://cl.ly/2w3B2u3o2T1d3u2a0p1o
* Merge branch 'master' into wdtkRobin Houston2012-05-25-1/+5
|\
| * Merge branch 'hotfix/0.5.2'0.5.2Seb Bacon2012-05-22-1/+5
| |\
| | * document hotfix changeSeb Bacon2012-05-22-0/+4
| | |
| | * Ensure we always return a string of some kind when asking for the ↵Seb Bacon2012-05-22-1/+1
| |/ | | | | | | short_or_long_name of a public body
* | Filter public body tracks by event typeRobin Houston2012-05-04-25/+66
| | | | | | | | | | Add the facility to filter the public body feed by event type using a query string parameter, e.g. event_type=sent.
* | Fixes to integration/admin_specRobin Houston2012-03-20-2/+1
| | | | | | | | | | | | 1. Remove useless call to spec_helper’s basic_auth_login method 2. Use Base64.encode64, rather than b64encode which also prints the encoded string to standard output.
* | Fix the "log in as" functionRobin Houston2012-03-20-14/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the "log in as" function after 3b6e5a692b852a88f55b21a7210f60a6f7cfc24b would attempt to log the admin user out before issuing the redirect. Unfortunately this approach does not work on WhatDoTheyKnow, where the admin pages are served via a different domain (secure.mysociety.org) and so do not share session information with the rest of the site. This commit changes it to mark the PostRedirect with circumstance == "login_as", which signals the user controller to log out the previous user even if they are an admin. In other words, the user is logged out on the main site rather than the admin site, skirting this problem. Closes #450.
* | No code changesRobin Houston2012-03-13-3/+5
| | | | | | | | Just trailing whitespace & one comment.
* | Admin users clicking confirmation linksRobin Houston2012-03-13-2/+53
| | | | | | | | Fixes #446. See issue for details.
* | Only trailing whitespaceRobin Houston2012-02-16-1/+1
| |
* | Add SURVEY_URL and SURVEY_SECRET to general.yml-exampleRobin Houston2012-02-16-0/+5
| | | | | | | | | | | | In the wdtk branch *ONLY* because the deployment system likes the example file to define the same variables as the actual config file.
* | Tweak the custom routes mechanismRobin Houston2012-02-16-3/+3
| | | | | | | | | | | | | | | | | | It didn’t seem to work before. (?) Note that this requires a change to the code as e.g. in https://github.com/sebbacon/alavetelitheme/blob/master/lib/config/custom-routes.rb because the route configuration code should not be inside a Dispatcher.to_prepare block now.
* | The .not-for-print rule needs to be !IMPORTANTRobin Houston2012-02-10-1/+1
| |
* | Generic class for hiding things from printRobin Houston2012-02-10-1/+6
| |
* | Upgrade commonlibRobin Houston2012-02-10-0/+0
| | | | | | | | because we want the new version of the survey module.
* | Merge branch 'master' into wdtkRobin Houston2012-02-09-11790/+43335
|\|
| * Merge branch 'release/0.5.1'Seb Bacon2012-02-09-11823/+43371
| |\ | | | | | | | | | | | | Conflicts: README.md
| | * Backup latest po files from Transifex0.5.1release/0.5.1Seb Bacon2012-02-09-569/+1039
| | |
| | * Document troubleshooting email problems a bit moreSeb Bacon2012-02-09-0/+41
| | |
| | * Update all the PO files as well as the POT when running our gettext ↵Seb Bacon2012-02-08-1857/+1776
| | | | | | | | | | | | commands. Also, don't word-wrap. Includes non-word-wrapped source files.
| | * Update translation documentation to reflect proposed new workflowSeb Bacon2012-02-08-30/+73
| | |
| | * Backup latest po files from TransifexSeb Bacon2012-02-08-11725/+13864
| | |
| | * Remove redundant 'sr' translation (we are using 'sr@latin' instead)Seb Bacon2012-02-08-4501/+0
| | |
| | * Demote CZ translation from a feature.Seb Bacon2012-02-07-1/+2
| | |
| | * Invert instructions so they are correct!Seb Bacon2012-02-07-2/+2
| | |
| | * Mention CZ translationSeb Bacon2012-02-07-0/+1
| | |
| | * changes for version 0.5.1Seb Bacon2012-02-07-0/+28
| | |
| | * New Czech translationSeb Bacon2012-02-07-0/+4818
| | |
| | * Update translation docs to match current realitySeb Bacon2012-02-07-6/+2
| | |
| | * latest translationsSeb Bacon2012-02-07-658/+29127
| | |
| | * Update instructions:Seb Bacon2012-02-07-1/+1
| | | | | | | | | | | | | | | | | | all the Exims I've used lately already have a log_selector setting. This syntax allows us to override that. Otherwise, you get complaints from Exim.
| | * Attempt to ensure tests always run using the "test" environment, by:Seb Bacon2012-02-07-14/+13
| | | | | | | | | | | | | | | 1) Not overriding any *existing* RAILS_ENV setting in rails_env.rb 2) Always creating a rails_env.rb file
| | * Create config/rails_env.rb in productionRobin Houston2012-02-06-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially revert 2eac4bef8d73f47bbe579b6f787ef54b8d782d7a, creating config/rails_env.rb in production only. This should address some of the difficulties with config/rails_env.rb causing unexpected behaviour in development, whilst forcing Rails into production environment where necessary for scripts run from cron etc. Closes #418?
| | * Merge branch 'develop' of github.com:sebbacon/alaveteli into developRobin Houston2012-02-06-1/+1
| | |\
| | | * Merge branch 'release/0.5' of github.com:sebbacon/alaveteli into developDavid Cabo2012-02-05-1/+1
| | | |\
| | * | | Don’t index unconfirmed usersRobin Houston2012-02-06-1/+22
| | | | | | | | | | | | | | | | | | | | Closes #415.
| | * | | Let admin users use auto-login URLsRobin Houston2012-02-06-8/+70
| | |/ / | | | | | | | | | | | | | | | | | | | | Don't change logged-in user from an admin when visiting a auto-login URL. Closes #306.
| | * | Change wording of rate-limited pageRobin Houston2012-02-05-4/+14
| | | | | | | | | | | | | | | | | | | | Include information about what the per-day limit is, and when the user can next make a request. Fixes #412.
| | * | Correct link to doc folder from READMERobin Houston2012-02-05-1/+1
| | | | | | | | | | | | | | | | Fixes #413.
| | * | Return 404 for /feed/user/no_such_userRobin Houston2012-02-03-0/+6
| |/ / |/| | | | | | | | Fixes #407.
* | | Test should not depend on nondeterministic orderRobin Houston2012-02-03-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #409 seems to be another problem of the same type as #408, though with the important difference that the bug in this case is in the test suite rather than the code under test. RequestMailer sends alert emails warning of overdue requests. However it does not specify the order that these messages are sent in, but runs over the overdue requests in whatever order they are returned by a database query (that does not have an order by clause). Therefore it is not safe for the test code to assume that the alert mails will have been sent in a particular order: just as with #408 it seems that they were *usually* sent in the order assumed by the test code, but occasionally not -- which would result in sporadic test failures. Closes #409.
* | | Specify attachment orderingRobin Houston2012-02-03-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So it turns out that issue #408 is a real and potentially nasty bug. The code was assuming that attachments are returned in the order they were created, which is a) not guaranteed to be the case, and b) sometimes actually not the case, hence the occasional test failures. This trivial patch corrects the issue by sorting attachments by id. The effect of this is to return them in the order they were added to the database, since all were added using the same sequence in a single database session. Fixes #408.
* | | Remove trailing whitespaceRobin Houston2012-02-03-2/+2
| | |
* | | Eliminate trailing spaces in test namesRobin Houston2012-02-03-5/+5
| | | | | | | | | | | | Really, what was that about?
* | | Better test assertionsRobin Houston2012-02-03-17/+17
| | | | | | | | | | | | | | | Change the test assertions so they give more informative errors when they fail -- as they sometimes do: see issue #408.
* | | Merge branch 'release/0.5' into developRobin Houston2012-02-03-176/+131
|\ \ \
* \ \ \ Merge branch 'release/0.5' into developRobin Houston2012-02-01-2148/+3001
|\ \ \ \
| | | * | Merge branch 'release/0.5' of github.com:sebbacon/alaveteliDavid Cabo2012-02-05-1/+1
| | | |\|
| | | | * Don't use absolute path when including the 'custom-routes' file, or themes ↵0.5release/0.5David Cabo2012-02-05-1/+1
| | | |/ | | |/| | | | | | | | | can't override it. Fixes #416.