aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeLines
* Merge branch 'feature/rails-3-2-upgrade-spike' into ↵Mark Longair2013-11-29-64/+70
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+3
| | | | | | | | | | | | 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.
| * 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.
| * 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/+36
| |
| * Fix links to /images to use image_tag insteadMark Longair2013-09-30-3/+3
| |
| * Make fancybox work againMark Longair2013-09-30-0/+359
| |
| * Add the IE 6 and IE 7 compatability CSS to the asset pipelineMark Longair2013-09-30-3/+24
| |
| * Move the print.css stylesheet into the asset pipelineMark Longair2013-09-30-0/+49
| |
| * Move to serving main.css from the asset pipelineMark Longair2013-09-30-28/+28
| |
| * Also add main.css to the asset pipelineMark Longair2013-09-30-0/+1779
| |
| * Fix the links to the Twitter and RSS iconsMark Longair2013-09-30-5/+5
| |
| * Serve fonts from the asset pipelineMark Longair2013-09-30-0/+1405
| | | | | | | | | | | | 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/+375
| |
| * Move all remaining images from public into app/assets/images/Mark Longair2013-09-30-0/+9
| |
| * WiP: also move admin CSS and images into the asset pipelineMark Longair2013-09-30-1/+1
| | | | | | | | | | 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-1/+655
| |
| * Switch Javascript (bar admin) to be served with the asset piplineMark Longair2013-09-30-8/+1855
| |
| * Move header to partial to make it easier to customize.Louise Crow2013-09-30-37/+38
| |
| * Beginning of switch to using the asset pipelineMark Longair2013-09-30-0/+3
| |
* | Use the jquery-rails-ui gem, just including the modules we needMark Longair2013-11-26-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.)
* | Remove jquery-ui; in a later commit we'll add it back via the gemMark Longair2013-11-26-528/+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.
* | Don't include the main stylesheet directly; it's now in application.cssMark Longair2013-11-26-3/+2
| |
* | Move last JS files from public/javascripts/ to app/assets/javascripts/Mark Longair2013-11-26-0/+3638
| |
* | Add an empty custom.css to cope with THEME_URLS being emptyMark Longair2013-11-26-0/+5
| |
* | Fix asset inclusion where THEME_URLS is emptyMark Longair2013-11-26-1/+1
| |
* | Add Jedidiah's placeholder logoJedidiah Broadbent2013-11-26-0/+0
| |
* | Some of the non-manifest assets must have the full basenameMark Longair2013-11-19-3/+3
| | | | | | | | | | | | | | In production mode, the javascript_include_tag and stylesheet_link_tag helpers seem to fail unless the non-manifest assets are given the full basename, whereas the manifests, e.g. application.js, can be referred to as just, e.g. 'application'.
* | Use font-url in fonts.scssMark Longair2013-11-19-30/+30
| |
* | Generate fonts.css from SCSSMark Longair2013-11-19-0/+0
| |
* | Include both the main and custom CSS filesMark Longair2013-11-19-0/+2
| |
* | Fix the inclusion of CSS in output for zip file downloadMark Longair2013-11-19-2/+2
| |
* | Fix links to icons for attachmentsMark Longair2013-11-19-3/+3
| |
* | Fix the use of jquery.Jcrop for profile photosMark Longair2013-11-19-1/+36
| |
* | Fix links to /images to use image_tag insteadMark Longair2013-11-19-3/+3
| |
* | Make fancybox work againMark Longair2013-11-19-0/+359
| |
* | Add the IE 6 and IE 7 compatability CSS to the asset pipelineMark Longair2013-11-19-3/+24
| |
* | Move the print.css stylesheet into the asset pipelineMark Longair2013-11-19-0/+49
| |
* | Move to serving main.css from the asset pipelineMark Longair2013-11-19-28/+28
| |
* | Also add main.css to the asset pipelineMark Longair2013-11-19-0/+1779
| |
* | Fix the links to the Twitter and RSS iconsMark Longair2013-11-19-5/+5
| |
* | Serve fonts from the asset pipelineMark Longair2013-11-19-0/+1405
| | | | | | | | | | | | 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/
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-26 08:36:16 +0000