aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Move strip_attributes out of vendor/pluginsMark Longair2013-11-29-3/+3
* With Rails 3.2, switching theme requires asset recompilationMark Longair2013-11-29-1/+5
* Merge branch 'feature/rails-3-2-upgrade-spike' into feature/switch-to-asset-p...Mark Longair2013-11-29-283/+157
|\
| * Add a dummy exception notification address for testingLouise Crow2013-11-12-2/+9
| * Require activesupport before mail gem.Louise Crow2013-11-12-0/+3
| * Silence deprecation warnings.Louise Crow2013-11-12-0/+3
| * Update spec to match upgraded mail gem behaviour.Louise Crow2013-11-12-1/+1
| * 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
| * Remove virtual attribute created_atLouise Crow2013-11-12-1/+0
| * In excerpt, radius is now an option.Louise Crow2013-11-12-8/+8
| * Highlighter is now an option.Louise Crow2013-11-12-2/+2
| * Don't specify format in template name.Louise Crow2013-11-12-11/+15
| * Disambiguate File from ActiveRecord::Fixture::FileLouise Crow2013-11-12-1/+1
| * Add default Rails 3.2 development settings.Louise Crow2013-11-12-0/+7
| * Update gems.Louise Crow2013-11-12-62/+60
| * 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
| * 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
| * 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
| * 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
| * 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
* | Update to jquery-rails to a version without jquery-uiMark Longair2013-11-26-3/+3
* | Remove jquery-ui; in a later commit we'll add it back via the gemMark Longair2013-11-26-529/+0
* | Don't include the main stylesheet directly; it's now in application.cssMark Longair2013-11-26-4/+2
* | Move last JS files from public/javascripts/ to app/assets/javascripts/Mark Longair2013-11-26-0/+0
* | Precompile the assets in rails-post-deployMark Longair2013-11-26-0/+2