aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Delete .cvsignoreSean Handley2014-01-12-5/+0
| | | | Since the project's now under Git, this can be removed!
* Update commonlib for the Unicode-aware case checking updateMark Longair2014-01-09-0/+0
|
* Merge branch 'atlatszo_dev' into rails-3-developLouise Crow2014-01-09-1/+1
|\
| * localisation bug fixed in request_controllerGyörgy Peng2014-01-08-1/+1
| | | | | | It is a better solution to forma sentenses in po file, therefore the substring in variable added to _() as a parameter.
* | Merge branch 'atlatszo_dev' into rails-3-developLouise Crow2014-01-09-11/+14
|\|
| * Update wall.html.erbGyörgy Peng2014-01-06-1/+1
| | | | | | '\' removed
| * Adding headers to wallGyörgy Peng2014-01-06-11/+14
| | | | | | | | | | | | | | When a user has no activity and following nothing, his wall page contains nothing, an empty page appears. My suggestion to change the views/user/wall.html.erb: - adding headers to page with title text - adding paragraph with text "nothing to display"
* | Downgrade rubygems to 2.1.11Louise Crow2014-01-09-0/+1
|/ | | | | | Rubygems 2.2.0 appears to have dropped support for ruby 1.8.7 - the immediate problem for us is that there are errors in building the charlock_holmes gem.
* Merge branch 'feature/hidden-explanation-cleanup' into rails-3-developLouise Crow2013-12-19-9/+7
|\
| * Standardise explanation generation by using render_to_stringLouise Crow2013-12-18-9/+7
| |
* | Merge branch 'release/0.16' into rails-3-developLouise Crow2013-12-19-0/+52
|\ \
| * | Add a note about deleting vendor/pluginsLouise Crow2013-12-19-0/+9
| | |
| * | Merge branch 'rails-3-develop' into release/0.16Louise Crow2013-12-16-2/+2
| |\ \
| * \ \ Merge branch 'rails-3-develop' into release/0.16Louise Crow2013-12-11-17/+2
| |\ \ \
| * | | | Add release notes for 0.16Louise Crow2013-12-10-0/+43
| | | | |
* | | | | Merge branch 'rails-3-develop' of ↵Louise Crow2013-12-19-47/+61
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * \ \ \ \ Merge branch 'feature/install-script-rewrite-hostname' into rails-3-developMark Longair2013-12-17-0/+5
| |\ \ \ \ \
| | * | | | | Rewrite myhostname in /etc/postfix/main.cf in the install scriptMark Longair2013-12-10-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary because the install script is also run on creating a new EC2 instance from the AMI in order to update the configuration with the new internal and external names; the hostname will be different in this case and otherwise myhostname wouldn't be rewritten.
| * | | | | | Merge branch 'ab_annotations_1' into rails-3-developMark Longair2013-12-17-47/+56
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Display annotations on user page.Andrew Black2013-12-16-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parameterise /admin_request/_some_annotations.html.erbi to allow it to be called from user and request pages
| | * | | | | Move annotations to _some_annotations.html.erbAndrew Black2013-12-16-47/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And refactor admin_request/show.html.erb to use this.
* | | | | | | Update will_paginate gem.Louise Crow2013-12-19-1/+1
|/ / / / / /
* | | | | | Merge branch 'feature/localise-reports' into rails-3-developLouise Crow2013-12-16-4/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Mark up some more text for translation.Louise Crow2013-12-16-4/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'feature/interpolation-fixes' into rails-3-developLouise Crow2013-12-12-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add extra argument for MissingInterpolationArgument errorLouise Crow2013-12-12-2/+2
|/ / / / | | | | | | | | | | | | Revert translation of interpolated variable in French locale.
* | | | Remove old patch.Louise Crow2013-12-11-16/+0
| | | |
* | | | Small fixes for favicon.icoLouise Crow2013-12-10-1/+2
| |_|/ |/| |
* | | Syntax fixes.Louise Crow2013-12-09-5/+5
| | |
* | | Latest translations from TransifexLouise Crow2013-12-09-419/+10965
| | |
* | | Merge branch 'feature/world-sites-update' into rails-3-developLouise Crow2013-12-09-1/+14
|\ \ \
| * | | Add the newest Alaveteli sites.Louise Crow2013-12-09-1/+14
| | |/ | |/|
* | | Merge branch 'feature/add-favicon-link' into rails-3-developLouise Crow2013-12-09-1/+1
|\ \ \ | |/ / |/| |
| * | Use a favicon link helper to point to our pipeline favicon.Louise Crow2013-12-09-1/+1
| | |
* | | Merge branch 'feature/en-ug-translation' into rails-3-developLouise Crow2013-12-09-0/+3510
|\ \ \
| * | | Add Ugandan English translation file.Louise Crow2013-12-09-0/+3510
| | | | | | | | | | | | | | | | N.B. as we haven't been able to get Transifex to add en_UG yet, this file was updated in poedit locally.
* | | | Merge branch 'feature/display-social-media-when-configured' into rails-3-developLouise Crow2013-12-09-0/+19
|\ \ \ \
| * | | | Only show the blog if a BLOG_FEED is configured.Louise Crow2013-12-09-0/+17
| | | | |
| * | | | Only show the twitter link if an account is configured.Louise Crow2013-12-09-0/+2
| |/ / /
* | | | Merge branch 'feature/1233-allow-crawling-of-attachments' into rails-3-developLouise Crow2013-12-09-1/+5
|\ \ \ \
| * | | | Add an 'Allow' directive to allow crawling of cached attachments.Louise Crow2013-12-03-1/+5
| | | | | | | | | | | | | | | | | | | | Should resolve #1233
* | | | | Merge branch 'feature/1263-public-body-translation-fix' into rails-3-developLouise Crow2013-12-09-6/+6
|\ \ \ \ \
| * | | | | Move disclosure log to common part of form.Louise Crow2013-12-04-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It isn't in the list of attributes that is translated, so was causing a mass assignment error when the code in public_body.translated_versions= was attempting to assign it. There's a possible underlying inconsistency here between the treatment of publication_scheme and disclosure_log - one is translated and one isn't. I've ticketed that separately (#1264)
* | | | | | Merge branch 'feature/overridable-act-on' into rails-3-developLouise Crow2013-12-09-16/+16
|\ \ \ \ \ \
| * | | | | | Move "Act on what you've" learnt to partialLouise Crow2013-12-05-16/+16
| | |_|/ / / | |/| | | | | | | | | | | | | | | | In order to make it easier to override.
* | | | | | Merge branch 'feature/locale-underscore-fixes' into rails-3-developLouise Crow2013-12-09-3/+22
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Make sure globalize uses the right locale version when updating.Louise Crow2013-12-05-2/+11
| | | | | |
| * | | | | Search for bodies using the underscore version of the locale.Louise Crow2013-12-05-1/+11
| |/ / / /
* | | | | More detail on how to make a pull request.Louise Crow2013-12-09-1/+2
| | | | |
* | | | | Merge branch 'feature/less-destructive-themes-install' into rails-3-developLouise Crow2013-12-09-59/+79
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 23:46:25 +0000