aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | | Move has_tag_string out of vendor/pluginsMark Longair2013-11-29-2/+3
| | | |
| * | | Move strip_attributes out of vendor/pluginsMark Longair2013-11-29-3/+3
| | | |
* | | | Add timestamps to public_body_translation fixtures.Louise Crow2013-11-29-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Between rails 3.2.0 and 4.0.1rc4, timestamps were constrained to be non-null. As globalize creates the public_body_translation table with timestamps, this means there are errors in the tests when trying to insert the fixture data, which doesn't have timestamps. These errors were only appearing on Travis because locally the test database is cloned from the development structure rather than being created by running the migrations.
* | | | Merge remote-tracking branch 'origin/merged-rails-3-2-assset-pipeline' into ↵Louise Crow2013-11-29-2027/+482
|\| | | | |_|/ |/| | | | | | | | | | | | | | rails-3-develop Conflicts: Gemfile.lock
| * | With Rails 3.2, switching theme requires asset recompilationMark Longair2013-11-29-1/+5
| | |
| * | Merge branch 'feature/rails-3-2-upgrade-spike' into ↵Mark Longair2013-11-29-283/+157
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/switch-to-asset-pipeline Conflicts: Gemfile.lock app/assets/images/admin-theme/ui-bg_flat_0_aaaaaa_40x100.png app/assets/images/admin-theme/ui-bg_flat_55_fbf9ee_40x100.png app/assets/images/admin-theme/ui-bg_flat_65_ffffff_40x100.png app/assets/images/admin-theme/ui-bg_flat_75_cccccc_40x100.png app/assets/images/admin-theme/ui-bg_flat_75_dadada_40x100.png app/assets/images/admin-theme/ui-bg_flat_75_e6e6e6_40x100.png app/assets/images/admin-theme/ui-bg_flat_75_ffffff_40x100.png app/assets/images/admin-theme/ui-bg_inset-soft_95_fef1ec_1x100.png app/assets/images/admin-theme/ui-icons_222222_256x240.png app/assets/images/admin-theme/ui-icons_2e83ff_256x240.png app/assets/images/admin-theme/ui-icons_454545_256x240.png app/assets/images/admin-theme/ui-icons_888888_256x240.png app/assets/images/admin-theme/ui-icons_cd0a0a_256x240.png app/assets/javascripts/admin.js app/assets/javascripts/admin/jquery-ui.min.js app/assets/javascripts/application.js app/assets/javascripts/jquery-ui.min.js app/assets/javascripts/jquery.flot.errorbars.min.js app/assets/javascripts/jquery.flot.min.js app/assets/javascripts/stats.js app/assets/stylesheets/application.css app/assets/stylesheets/fonts.scss app/views/general/_stylesheet_includes.html.erb app/views/layouts/admin.html.erb app/views/layouts/default.html.erb app/views/public_body/statistics.html.erb config/application.rb config/environments/development.rb
| | * | Add a dummy exception notification address for testingLouise Crow2013-11-12-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | ActionMailer now checks for a 'to' address on sending mail, so supply one so that we can check exception notification mail sending. Also check that we have one before trying to call the exception notification code.
| | * | Require activesupport before mail gem.Louise Crow2013-11-12-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If activesupport isn't present, the mail gem will load it's own version, and when rails is eventually loaded in this script, the warning "warning: already initialized constant VALID CHARACTER" is written to standard error.
| | * | Silence deprecation warnings.Louise Crow2013-11-12-0/+3
| | | | | | | | | | | | | | | | | | | | The remaining deprecation warnings are for the plugins, and they interfere with incoming mail handling by producing output on stderr.
| | * | Update spec to match upgraded mail gem behaviour.Louise Crow2013-11-12-1/+1
| | | | | | | | | | | | | | | | | | | | The new name value doesn't escape a double quote within single quotes, which seems more correct.
| | * | Remove obsolete test.Louise Crow2013-11-12-88/+0
| | | |
| | * | Update method name in patched method.Louise Crow2013-11-12-2/+3
| | | |
| | * | Remove obsolete patches.Louise Crow2013-11-12-61/+0
| | | |
| | * | Mock methods need to call mail() to generate a proper mail.Louise Crow2013-11-12-1/+1
| | | |
| | * | Change class for newer version of mail gem.Louise Crow2013-11-12-2/+2
| | | |
| | * | Use calls to write_attributeLouise Crow2013-11-12-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Under the Rails hood, using the setters for attributes now involves calling the getters too, (for a will_change? check), so these calls became circular - use write_attribute instead.
| | * | Remove virtual attribute created_atLouise Crow2013-11-12-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The need for this was removed in 0ec315c52a731ff149977b9231a15770fa3bd742, and it now causes a MissingAttribute error.
| | * | In excerpt, radius is now an option.Louise Crow2013-11-12-8/+8
| | | | | | | | | | | | | | | | Passing it as an argument is deprecated.
| | * | Highlighter is now an option.Louise Crow2013-11-12-2/+2
| | | | | | | | | | | | | | | | Passing it as an argument is deprecated.
| | * | Don't specify format in template name.Louise Crow2013-11-12-11/+15
| | | | | | | | | | | | | | | | | | | | In render calls, that's now deprecated in favour of using the :formats option.
| | * | Disambiguate File from ActiveRecord::Fixture::FileLouise Crow2013-11-12-1/+1
| | | |
| | * | Add default Rails 3.2 development settings.Louise Crow2013-11-12-0/+7
| | | | | | | | | | | | | | | | As suggested in http://guides.rubyonrails.org/3_2_release_notes.html
| | * | Update gems.Louise Crow2013-11-12-62/+60
| | | | | | | | | | | | | | | | | | | | | | | | As described in step 1.2 of http://guides.rubyonrails.org/3_2_release_notes.html. Rails to latest 3.2 - 3.2.15
| | * | Font styles need to be preprocessed for font-path calls.Louise Crow2013-11-12-0/+0
| | | |
| | * | Fix the inclusion of CSS in output for zip file downloadMark Longair2013-11-08-2/+2
| | | |
| | * | Fix links to icons for attachmentsMark Longair2013-09-30-3/+3
| | | |
| | * | Fix the use of jquery.Jcrop for profile photosMark Longair2013-09-30-1/+1
| | | |
| | * | Fix links to /images to use image_tag insteadMark Longair2013-09-30-3/+3
| | | |
| | * | Make fancybox work againMark Longair2013-09-30-0/+0
| | | |
| | * | Add the IE 6 and IE 7 compatability CSS to the asset pipelineMark Longair2013-09-30-4/+6
| | | |
| | * | Move the print.css stylesheet into the asset pipelineMark Longair2013-09-30-0/+0
| | | |
| | * | Move to serving main.css from the asset pipelineMark Longair2013-09-30-30/+31
| | | |
| | * | Also add main.css to the asset pipelineMark Longair2013-09-30-0/+0
| | | |
| | * | Fix the links to the Twitter and RSS iconsMark Longair2013-09-30-5/+5
| | | |
| | * | Serve fonts from the asset pipelineMark Longair2013-09-30-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/
| | * | WiP: fix more stylesheet linksMark Longair2013-09-30-3/+3
| | | |
| | * | Fix a bug in jquery-ui-1.8.15.custom.cssMark Longair2013-09-30-1/+1
| | | | | | | | | | | | | | | | | | | | The "font-size: ;" in jquery-ui-1.8.15.custom.css breaks asset precompilation.
| | * | WiP: moving everything out of stylesheets/admin-themeMark Longair2013-09-30-0/+1
| | | |
| | * | Move all remaining images from public into app/assets/images/Mark Longair2013-09-30-0/+0
| | | |
| | * | .gitignore: /public/assets only has generated filesMark Longair2013-09-30-0/+1
| | | |
| | * | WiP: also move admin CSS and images into the asset pipelineMark Longair2013-09-30-1058/+6
| | | | | | | | | | | | | | | | | | | | We no longer need to run compass to regenerate the admin CSS - it will be done automatically.
| | * | WiP: Bundle up admin javascript using the asset pipelineMark Longair2013-09-30-33/+16
| | | |
| | * | Switch Javascript (bar admin) to be served with the asset piplineMark Longair2013-09-30-10/+29
| | | |
| | * | Upgrade sass-railsLouise Crow2013-09-30-8/+10
| | | | | | | | | | | | | | | | An attempt to get image-path to work in sass files.
| | * | Move header to partial to make it easier to customize.Louise Crow2013-09-30-37/+38
| | | |
| | * | Adding rubyracer to supply a js runtimeLouise Crow2013-09-30-0/+7
| | | |
| | * | Beginning of switch to using the asset pipelineMark Longair2013-09-30-1/+53
| | | |
| * | | Use the jquery-rails-ui gem, just including the modules we needMark Longair2013-11-26-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As far as I can tell, we only use the 'tabs' module in admin and 'datepicker' on the user-facing part of the site. The advantage of using this packaging of the gem is that its assets are in the gem, which simplifies things greatly - otherwise we'd end up doing something like rewrite the jquery-ui CSS to SCSS, referencing the image assets via sass-rails helpers or keep them in their expected paths in public or something. (Thanks to Louise Crow for pointing out the problem of just moving jquery-ui's image assets into the asset pipeline.)
| * | | Update to jquery-rails to a version without jquery-uiMark Longair2013-11-26-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The jquery-rails documentation for the latest version now recommends using the jquery-ui-rails plugin instead. To avoid the possible confusion of having two copies of jquery-ui in different gems, update jquery-rails to the version that doesn't contain jquery-ui.
| * | | Remove jquery-ui; in a later commit we'll add it back via the gemMark Longair2013-11-26-529/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The intention is to stop including our own custom build of jquery-ui but instead use the jquery-ui-rails gem, which works well with the asset pipeline. This commit should remove all traces of the old download of jquery-ui.
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-01 23:42:02 +0000