aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | | Refactor common logic about prominence and access.Louise Crow2013-09-16-16/+15
| | | | | | | | | | | | | | | | Move it into the Ability module.
| * | | Add a method to ask whether a user can view an incoming message.Louise Crow2013-09-16-0/+67
| | | |
| * | | Rename method to make it a bit more genericLouise Crow2013-09-16-5/+5
| | | | | | | | | | | | | | | | A super user will be able to see all hidden things, not just requests.
| * | | Refactor correspondence template into partials.Louise Crow2013-09-16-81/+63
| | | |
| * | | Add response_event helperLouise Crow2013-09-16-0/+18
| | | | | | | | | | | | | | | | | | | | Add a convenience method for getting the 'response' event associated with an incoming message.
| * | | Add prominence to incoming message.Louise Crow2013-09-16-0/+34
| | | |
| * | | Re-annotate models with database fieldsLouise Crow2013-09-16-143/+561
| | | |
| * | | Remove prominence.Louise Crow2013-09-16-36/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a migration to remove the unused column 'prominence' from info_request_events, remove validation of prominence, remove unused InfoRequestEvent.user_can_view? method. Remove references to InfoRequestEvent.prominence.
* | | | Merge branch 'feature/issue-902-fix' into rails-3-developLouise Crow2013-09-17-1/+27
|\ \ \ \
| * | | | Allow a unicode-only title in validationLouise Crow2013-09-17-1/+27
| | | | |
* | | | | Merge branch 'feature/issue-555-fix' into rails-3-developLouise Crow2013-09-17-20/+54
|\ \ \ \ \
| * | | | | Handle a race condition in index update requests.Louise Crow2013-09-17-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
| * | | | | Add a failing spec for handling a race conditionLouise Crow2013-09-17-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spec uses a hook method to simulate the insertion of an acts_as_xapian_job in another process for the model. Credit to: http://stackoverflow.com/questions/2017587/simulating-race-conditions-in-rspec-unit-tests Conflicts: vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
| * | | | | Refactor duplicated code into one shared method.Louise Crow2013-09-17-19/+10
| | | | | |
* | | | | | Merge branch 'make-graph-labels-translatable' into rails-3-developLouise Crow2013-09-12-11/+11
|\ \ \ \ \ \
| * | | | | | Make graph title and axis labels translatableMark Longair2013-09-12-11/+11
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | The labels on the public body statistics graphs weren't marked as being translatable. Fixes #1079.
* | | | | | Add simple task for updating theme translations.Louise Crow2013-09-12-0/+26
| | | | | |
* | | | | | Remove obsolete script.Louise Crow2013-09-12-22/+0
| | | | | |
* | | | | | Remove unused task.Louise Crow2013-09-12-22/+0
|/ / / / /
* | | | | Merge branch 'public-body-locale-fallback' into rails-3-developLouise Crow2013-09-12-31/+158
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/public_body_controller.rb config/general.yml-example lib/configuration.rb
| * | | | | Don't display duplicate public bodies with the fallbackMark Longair2013-09-12-30/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces some raw SQL statement for the fallback case, but we can't see an easy way to avoid that in this case. This commit also adds some tests that assert the sorting and non-duplication properties of the listing. Thanks to Louise Crow for working out the SQL expression for falling back to the default locale.
| * | | | | Factor out the code to generate example single language public bodiesMark Longair2013-09-10-16/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's useful to be able to generate example public bodies that only have translations in particular languages.
| * | | | | Add tests to assert the new public body listing behaviourMark Longair2013-09-10-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests will fail unless we have the new behaviour for public body listing, which depend on the setting of PUBLIC_BODY_LIST_FALLBACK_TO_DEFAULT_LOCALE.
| * | | | | Fix locales used to find public bodies in AdminPublicBodyControllerMark Longair2013-09-10-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The locale returned from locale_from_params may be dash-separated, (the I18n module convention) whereas those in the public_body_translations table are underscore-separated. The AdminPublicBodyController was looking for dash-separated locales in that table, so ensure that dashes are substituted for underscores before using them in a query.
| * | | | | Make falling back to default locale in public body listings optionalMark Longair2013-09-10-14/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Tidy up SQL query stringsMark Longair2013-08-29-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the list method of PublicBodyController, capitalize the SQL keywords consistenly and don't include extraneous whitespace in the strings. (On the former point, previously only some were - the convention is a matter of some debate, but in this case the you editor's not doing to do syntax highlighting of SQL so having the keywords capitalized helps its readibility, I think.) I wouldn't normally do this kind of cosmetic tidying up, since it affects the tidiness of diffs and merges, but in this case I'm going to change all these lines in the next commit anyway, so that reasoning doesn't apply.
* | | | | | Remove unused stylesheetsLouise Crow2013-09-11-309/+0
| | | | | |
* | | | | | Fix typo.Louise Crow2013-09-11-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'body-stats-prerelease' into rails-3-developLouise Crow2013-09-05-25/+74
|\ \ \ \ \
| * | | | | Save cached columns once updated.Louise Crow2013-09-05-2/+13
| | | | | |
| * | | | | Don't save a public body version when updating the stats.Louise Crow2013-09-05-1/+3
| | | | | |
| * | | | | Don't dirty the first_letter attribute when not changed.Louise Crow2013-09-05-3/+14
| | | | | |
| * | | | | Don't dirty every attribute in checking for whitespace.Louise Crow2013-09-05-18/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check to see if the stripped version is different before setting it on the record. If we don't do this, the subsequent call to write_attribute in Globalize3 which uses attribute_will_change! means we're storing versions when there hasn't really been any change.
| * | | | | Don't re-index body when updating statsLouise Crow2013-09-05-0/+2
| | | | | |
| * | | | | Don't save versions of new counter cache columnsLouise Crow2013-09-05-1/+5
| | | | | |
* | | | | | Syntax fix.Louise Crow2013-09-05-1/+1
|/ / / / /
* | | | | Put rake in silent mode when run from cronLouise Crow2013-09-05-1/+1
| | | | |
* | | | | Add update of body stats to example cron file.Louise Crow2013-09-05-0/+2
| | | | |
* | | | | Add a verbosity flag to public body stats taskLouise Crow2013-09-05-1/+3
| | | | |
* | | | | Add bash script for updating body stats from cron.Louise Crow2013-09-05-0/+4
| | | | |
* | | | | Remove obsolete comment.Louise Crow2013-09-05-1/+0
| |/ / / |/| | |
* | | | Merge branch 'hotfix/0.13.0.2' into rails-3-developLouise Crow2013-09-04-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Add a timeout to document conversion with wvtext - it can hang.0.13.0.2hotfix/0.13.0.2Louise Crow2013-09-04-1/+1
| | | |
* | | | Merge branch 'hotfix/0.13.0.1' into rails-3-developLouise Crow2013-09-04-1/+1
|\| | |
| * | | Fix wrong method name.hotfix/0.13.0.1Louise Crow2013-08-28-1/+1
| | | |
| * | | Merge branch 'release/0.13'0.13Louise Crow2013-08-20-2490/+1148
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/bg/app.po locale/es/app.po locale/fi/app.po locale/fr/app.po locale/fr_CA/app.po locale/he_IL/app.po locale/hr/app.po locale/nb_NO/app.po locale/nl/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sl/app.po locale/vi/app.po script/rails-post-deploy
| * | | | The mysociety debian repo only has 64-bit packagesGanesh Sittampalam2013-08-13-1/+1
| | | | |
| * | | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/alaveteliLouise Crow2013-08-05-5/+3
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of ssh://git.mysociety.org/data/git/public/alaveteliIan Chard2013-08-01-14/+18
| | |\ \ \ \
| | * | | | | Run migrations before trying to install themeIan Chard2013-08-01-3/+1
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-26 00:06:13 +0000