aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Fix links to /images to use image_tag insteadMark Longair2013-11-19-3/+3
|
* Make fancybox work againMark Longair2013-11-19-0/+0
|
* Add the IE 6 and IE 7 compatability CSS to the asset pipelineMark Longair2013-11-19-4/+6
|
* Move the print.css stylesheet into the asset pipelineMark Longair2013-11-19-0/+0
|
* Move to serving main.css from the asset pipelineMark Longair2013-11-19-30/+31
|
* Also add main.css to the asset pipelineMark Longair2013-11-19-0/+0
|
* Fix the links to the Twitter and RSS iconsMark Longair2013-11-19-5/+5
|
* Serve fonts from the asset pipelineMark Longair2013-11-19-74/+75
| | | | | | Following the suggestion to use the sass-rails font-path helper: http://aokolish.me/blog/2011/12/24/at-font-face-with-the-asset-pipeline/
* Fix more stylesheet links for the asset pipelineMark Longair2013-11-19-3/+3
|
* Fix a bug in jquery-ui-1.8.15.custom.cssMark Longair2013-11-19-1/+1
| | | | | The "font-size: ;" in jquery-ui-1.8.15.custom.css breaks asset precompilation.
* Move everything out of stylesheets/admin-theme into app/assets/Mark Longair2013-11-19-0/+1
|
* Move all remaining images from public into app/assets/images/Mark Longair2013-11-19-0/+0
|
* .gitignore: /public/assets only has generated filesMark Longair2013-11-19-0/+1
|
* Move admin CSS and images into the asset pipelineMark Longair2013-11-19-1058/+6
| | | | | We no longer need to run compass to regenerate the admin CSS - it will be done automatically.
* Bundle up admin javascript using the asset pipelineMark Longair2013-11-19-33/+17
| | | | | This includes adding coffee-rails so that the .js.coffee file is compiled to .js automatically.
* Switch Javascript (bar admin) to be served with the asset piplineMark Longair2013-11-19-10/+30
|
* Upgrade sass-railsLouise Crow2013-11-19-8/+10
| | | | An attempt to get image-path to work in sass files.
* Adding rubyracer to supply a js runtimeLouise Crow2013-11-19-0/+7
|
* Enable the Rails asset pipeline (Sprockets)Mark Longair2013-11-19-1/+53
|
* Merge branch 'rails-3-develop' of ↵Louise Crow2013-11-19-42/+86
|\ | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * Also update Gemfile.lock to refer to the upstream globalizeMark Longair2013-11-19-3/+3
| |
| * Merge branch 'all-authorities-reduce-memory' into rails-3-developMark Longair2013-11-19-7/+43
| |\ | | | | | | | | | | | | This has already been cherry-picked into the wdtk branch, but it should also be merged into rails-3-develop
| | * Reduce the memory used to serve /body/all-authorities.csvMark Longair2013-11-14-7/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On WDTK, /body/all-authorities was using lots of memory - this commit reduces that by (a) fetching the public bodies in batches, rather than keeping them all in memory at one time and (b) writing the CSV to a file and then returning it with X-Sendfile (or equivalent), rather than returning the whole file from memory with send_data. There's a FIXME to do with the layout of download directories; if that's changed, the example nginx config, etc. will need to be updated too. This commit also adds a basic test for reasonable CSV being returned and switches from FasterCSV to CSV in order to fix this NotImplementedError under Ruby 1.9: Please switch to Ruby 1.9's standard CSV library. It's FasterCSV plus support for Ruby 1.9's m17n encoding engine. (The CSV version seems to still work fine under 1.8.7.)
| * | Merge branch 'fixes-for-upstream-globalize' into rails-3-developMark Longair2013-11-19-32/+40
| |\ \
| | * | Fix construction of example public bodies for upstream globalizeMark Longair2013-11-19-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're trying to switch to an upstream version of globalize, which now has Henare's change to allowed blank values without them being converted to nil - however, there is another intermediate change that was introduced which means that the name is only written back to the original table if the locale matches the default locale. This is described in more depth here: https://github.com/globalize/globalize/pull/183 This change broke the make_single_language_example helper, but this commit fixes that by also setting the default locale before creating the example public bodies.
| | * | Refactor some tests to use with_default_localeMark Longair2013-11-19-17/+15
| | | |
| | * | Add a helper method for temporarily setting I18n.default_localeMark Longair2013-11-19-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Although the I18n library has an I18n.with_locale helper, there's no equivalent for I18n.default_locale. This method will make a couple of our tests clearer and less brittle.
| * | | Update commonlib to include Alaveteli support in install-site.shMark Longair2013-11-19-0/+0
| | | |
* | | | Merge branch 'feature/set-rails-env-from-cap-config' into rails-3-developLouise Crow2013-11-19-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Add rails env to example config.Louise Crow2013-11-19-0/+2
| | | |
| * | | Allow the rails_env to be set from the deploy.yml file.Louise Crow2013-11-19-0/+1
|/ / /
* / / Use our own copy of globalize3 for now.Louise Crow2013-11-19-4/+4
|/ /
* | Update globalize3 repo.Louise Crow2013-11-18-5/+5
| | | | | | | | This is the commit where @henares' pull request was merged. This is a quick fix, but I think we want to see if we can use the globalize 3.0.1 gem with minimal fixes. It causes tests to fail at the moment, I think because we still have translated attributes in our public_bodies table (and not null constraints at the databse level on at least the name attribute).
* | Insert cookie stripping at correct point in middleware stack.Louise Crow2013-11-18-1/+13
| |
* | Session keys are stored as strings in Rails 3.Louise Crow2013-11-18-30/+30
| | | | | | | | Update our session-stripping code.
* | Merge branch 'master' into rails-3-developMark Longair2013-11-15-289/+317
|\ \
| * | Bump ALAVETELI_VERSION to 0.150.15Mark Longair2013-11-15-1/+1
| | |
| * | Release notes for 0.15Mark Longair2013-11-15-0/+28
| | |
| * | Fixes for the Welsh translationMark Longair2013-11-15-46/+46
| | |
| * | Include the latest translations from TransifexMark Longair2013-11-15-287/+287
| |/ | | | | | | | | Note that this includes some errors in the Welsh translation, which I will fix in a subsequent commit.
* | Merge branch 'rails-3-develop' of ↵Louise Crow2013-11-12-2713/+6930
|\| | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * Update translations after re-pulling from Transfix + cleaningrelease/0.15Mark Longair2013-11-08-246/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | As suggested in the release manager's checklist, this commit introduces the results of re-pulling from transifex: tx pull -a -f ... and cleaning the .po files again: bundle exec rake gettext:clean ... which removes the fuzzy strings from the repository.
| * Fix a syntax error in locale/sr@latin/app.poMark Longair2013-11-08-4/+1
| |
| * Fix a syntax error in locale/bg/app.poMark Longair2013-11-08-3/+1
| |
| * Updated .po files and the .pot file with 'rake gettext:find'Mark Longair2013-11-08-384/+625
| |
| * Update translatable columnsMark Longair2013-11-08-2/+1
| |
| * cy (Welsh) locale: fix various problemsMark Longair2013-11-08-81/+81
| | | | | | | | | | | | | | | | | | | | | | | | The latest updates had several problems, which are fixed in this commit, e.g. * Malformed links * Broken uses of variables (e.g. translating the 'date' in '{{date}}') Additionally, I've stripped unnecessary space around many HTML tags that may cause the text rendering to look odd.
| * cy (Welsh) locale: fix a link element's nameMark Longair2013-11-08-1/+1
| |
| * cy (Welsh) locale: fix capitalization of USER_NAMEMark Longair2013-11-08-3/+3
| |
| * Update with the latest translations from TransifexMark Longair2013-11-08-2213/+5663
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-30 07:43:13 +0000