Changeset [a6290f83981a7713d6315cc6d229bc5d52977d0a] by Kalin Harvey

Revision a6290f83981a7713d6315cc6d229bc5d52977d0a, committed by Kalin Harvey · May 3rd, 2009 @ 01:25 AM

Merge branch 'master' of git://github.com/graemeworthy/greenbuildingbrain

'master' of git://github.com/graemeworthy/greenbuildingbrain: attachment fu, realised added attachment fu, thanks rick olson poached this from perwikity toc scrolls to title of relevant content

Conflicts:

db/schema.rb

http://github.com/greenbuilding/...

81 changed files

M app/controllers/pictures_controller.rb
M app/helpers/pictures_helper.rb
M app/models/asset.rb
M app/models/item.rb
M app/models/picture.rb
M app/views/layouts/pictures.html.erb
M app/views/pictures/edit.html.erb
M app/views/pictures/index.html.erb
M app/views/pictures/new.html.erb
M app/views/pictures/show.html.erb
M config/deploy.rb
M config/initializers/core_ext.rb
M config/routes.rb
M db/migrate/20090503074638_create_pictures.rb
M db/migrate/20090503080831_create_assets.rb
M db/schema.rb
M public/medias/0000/0003/bikerider.jpg
M public/medias/0000/0003/bikerider_thumb.jpg
M public/medias/0000/0005/Endcat.jpg
M public/medias/0000/0005/Endcat_thumb.jpg
M public/pictures/0000/0001/Endcat.jpg
M public/pictures/0000/0001/Endcat_thumb.jpg
M public/stylesheets/scaffold.css
M spec/controllers/pictures_controller_spec.rb
M spec/fixtures/assets.yml
M spec/fixtures/pictures.yml
M spec/helpers/pictures_helper_spec.rb
M spec/models/asset_spec.rb
M spec/models/picture_spec.rb
M spec/routing/pictures_routing_spec.rb
M spec/views/pictures/edit.html.erb_spec.rb
M spec/views/pictures/index.html.erb_spec.rb
M spec/views/pictures/new.html.erb_spec.rb
M spec/views/pictures/show.html.erb_spec.rb
M vendor/plugins/attachment_fu/CHANGELOG
M vendor/plugins/attachment_fu/LICENSE
M vendor/plugins/attachment_fu/README
M vendor/plugins/attachment_fu/Rakefile
M vendor/plugins/attachment_fu/amazon_s3.yml.tpl
M vendor/plugins/attachment_fu/init.rb
M vendor/plugins/attachment_fu/install.rb
M vendor/plugins/attachment_fu/lib/geometry.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/cloud_file_backend.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/core_image_processor.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/gd2_processor.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/image_science_processor.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/mini_magick_processor.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/rmagick_processor.rb
M vendor/plugins/attachment_fu/rackspace_cloudfiles.yml.tpl
M vendor/plugins/attachment_fu/test/backends/db_file_test.rb
M vendor/plugins/attachment_fu/test/backends/file_system_test.rb
M vendor/plugins/attachment_fu/test/backends/remote/cloudfiles_test.rb
M vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb
M vendor/plugins/attachment_fu/test/base_attachment_tests.rb
M vendor/plugins/attachment_fu/test/basic_test.rb
M vendor/plugins/attachment_fu/test/database.yml
M vendor/plugins/attachment_fu/test/extra_attachment_test.rb
M vendor/plugins/attachment_fu/test/fixtures/attachment.rb
M vendor/plugins/attachment_fu/test/fixtures/files/fake/rails.png
M vendor/plugins/attachment_fu/test/fixtures/files/foo.txt
M vendor/plugins/attachment_fu/test/fixtures/files/rails.png
M vendor/plugins/attachment_fu/test/geometry_test.rb
M vendor/plugins/attachment_fu/test/processors/core_image_test.rb
M vendor/plugins/attachment_fu/test/processors/gd2_test.rb
M vendor/plugins/attachment_fu/test/processors/image_science_test.rb
M vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb
M vendor/plugins/attachment_fu/test/processors/rmagick_test.rb
M vendor/plugins/attachment_fu/test/schema.rb
M vendor/plugins/attachment_fu/test/test_helper.rb
M vendor/plugins/attachment_fu/test/validation_test.rb
M vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/color.rb
M vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/effects.rb
M vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/perspective.rb
M vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/quality.rb
M vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/scale.rb
M vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/watermark.rb
M vendor/plugins/attachment_fu/vendor/red_artisan/core_image/processor.rb