Changeset [dff2e110f72edbe961f2fee8a13b16b067a8224c] by makestory
2010-03-11 18:49:17 UTC
Merge branch 'mall' of git@github.com:Suave/1kg.org into
mall
http://github.com/Suave/1kg.org/commit/dff2e110f72edbe961f2fee8a13b...
Committed by makestory
- A app/controllers/admin/good_photos_controller.rb
- A app/controllers/admin/requirement_types_controller.rb
- A app/controllers/admin/requirements_controller.rb
- A app/controllers/admin/vendors_controller.rb
- A app/controllers/donations_controller.rb
- A app/controllers/gateway_controller.rb
- A app/controllers/mall_controller.rb
- A app/controllers/requirement_types_controller.rb
- A app/controllers/requirements_controller.rb
- A app/models/donation.rb
- A app/models/good.rb
- A app/models/good_photo.rb
- A app/models/product.rb
- A app/models/requirement.rb
- A app/models/requirement_type.rb
- A app/models/vendor.rb
- A app/views/admin/good_photos/_form.html.erb
- A app/views/admin/good_photos/index.html.erb
- A app/views/admin/good_photos/new.html.erb
- A app/views/admin/goods/_form.html.erb
- A app/views/admin/goods/edit.html.erb
- A app/views/admin/goods/fail.html.erb
- A app/views/admin/goods/index.html.erb
- A app/views/admin/goods/new.html.erb
- A app/views/admin/goods/sale.html.erb
- A app/views/admin/goods/successful.html.erb
- A app/views/admin/products/_form.html.erb
- A app/views/admin/products/index.html.erb
- A app/views/admin/products/new.html.erb
- A app/views/admin/requirement_types/_ext_form.html.erb
- A app/views/admin/requirement_types/edit.html.erb
- A app/views/admin/requirement_types/index.html.erb
- A app/views/admin/requirement_types/new.html.erb
- A app/views/admin/requirements/_form.html.erb
- A app/views/admin/requirements/edit.html.erb
- A app/views/admin/requirements/exchangable_list.html.erb
- A app/views/admin/requirements/new.html.erb
- A app/views/admin/requirements/non_exchangable_list.html.erb
- A app/views/admin/requirements/show.html.erb
- A app/views/admin/vendors/_form.html.erb
- A app/views/admin/vendors/index.html.erb
- A app/views/admin/vendors/new.html.erb
- A app/views/donations/commenting.html.erb
- A app/views/donations/index.html.erb
- A app/views/donations/new.html.erb
- A app/views/donations/thanks.html.erb
- A app/views/mailer/donation.erb
- A app/views/mall/_category.html.erb
- A app/views/mall/_detail.html.erb
- A app/views/mall/_footer.html.erb
- A app/views/mall/_list.html.erb
- A app/views/mall/category.html.erb
- A app/views/mall/index.html.erb
- A app/views/mall/show.html.erb
- A app/views/minisite/festcard09/dashboard/_requirements.html.erb
- A app/views/minisite/postcard/dashboard/_requirements.html.erb
- A app/views/requirement_types/_form.html.erb
- A app/views/requirement_types/index.html.erb
- A app/views/requirement_types/new.html.erb
- A app/views/requirement_types/show.html.erb
- A app/views/requirements/_requirement.html.erb
- A app/views/requirements/new.html.erb
- A app/views/requirements/show.html.erb
- A app/views/shared/_goods.html.erb
- A lib/onekg.rb
- A public/images/elong.gif
- A public/images/mall/graybar_more.gif
- A public/images/mall/helpcenter_arrow.jpg
- A public/images/mall/index_title_tuijianchanpin.gif
- A public/images/mall/index_title_xinpinshangshi.gif
- A public/images/mall/leftside_subpic_canyin.gif
- A public/images/mall/leftside_subpic_jiashi.gif
- A public/images/mall/leftside_subpic_wenju.gif
- A public/images/mall/leftside_subpic_xiangbao.gif
- A public/images/mall/leftside_title_home.jpg
- A public/images/mall/leftside_title_office.jpg
- A public/images/mall/leftside_title_traveling.jpg
- A public/images/point/donation.png
- A public/images/point/flow.png
- A public/images/point/logo.png
- A public/images/point/sidebar.png
- A public/images/point/title.png
- A public/stylesheets/mall.css
- A vendor/plugins/paperclip/LICENSE
- A vendor/plugins/paperclip/README.rdoc
- A vendor/plugins/paperclip/Rakefile
- A vendor/plugins/paperclip/cucumber/paperclip_steps.rb
- A vendor/plugins/paperclip/generators/paperclip/USAGE
- A vendor/plugins/paperclip/generators/paperclip/paperclip_generator.rb
- A vendor/plugins/paperclip/generators/paperclip/templates/paperclip_migration.rb.erb
- A vendor/plugins/paperclip/init.rb
- A vendor/plugins/paperclip/lib/paperclip.rb
- A vendor/plugins/paperclip/lib/paperclip/attachment.rb
- A vendor/plugins/paperclip/lib/paperclip/callback_compatability.rb
- A vendor/plugins/paperclip/lib/paperclip/geometry.rb
- A vendor/plugins/paperclip/lib/paperclip/interpolations.rb
- A vendor/plugins/paperclip/lib/paperclip/iostream.rb
- A vendor/plugins/paperclip/lib/paperclip/matchers.rb
- A vendor/plugins/paperclip/lib/paperclip/matchers/have_attached_file_matcher.rb
- A vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
- A vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_presence_matcher.rb
- A vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_size_matcher.rb
- A vendor/plugins/paperclip/lib/paperclip/processor.rb
- A vendor/plugins/paperclip/lib/paperclip/storage.rb
- A vendor/plugins/paperclip/lib/paperclip/thumbnail.rb
- A vendor/plugins/paperclip/lib/paperclip/upfile.rb
- A vendor/plugins/paperclip/paperclip.gemspec
- A vendor/plugins/paperclip/shoulda_macros/paperclip.rb
- A vendor/plugins/paperclip/tasks/paperclip_tasks.rake
- A vendor/plugins/paperclip/test/.gitignore
- A vendor/plugins/paperclip/test/attachment_test.rb
- A vendor/plugins/paperclip/test/database.yml
- A vendor/plugins/paperclip/test/fixtures/12k.png
- A vendor/plugins/paperclip/test/fixtures/50x50.png
- A vendor/plugins/paperclip/test/fixtures/5k.png
- A vendor/plugins/paperclip/test/fixtures/bad.png
- A vendor/plugins/paperclip/test/fixtures/s3.yml
- A vendor/plugins/paperclip/test/fixtures/twopage.pdf
- A vendor/plugins/paperclip/test/geometry_test.rb
- A vendor/plugins/paperclip/test/helper.rb
- A vendor/plugins/paperclip/test/integration_test.rb
- A vendor/plugins/paperclip/test/interpolations_test.rb
- A vendor/plugins/paperclip/test/iostream_test.rb
- A vendor/plugins/paperclip/test/matchers/have_attached_file_matcher_test.rb
- A vendor/plugins/paperclip/test/matchers/validate_attachment_content_type_matcher_test.rb
- A vendor/plugins/paperclip/test/matchers/validate_attachment_presence_matcher_test.rb
- A vendor/plugins/paperclip/test/matchers/validate_attachment_size_matcher_test.rb
- A vendor/plugins/paperclip/test/paperclip_test.rb
- A vendor/plugins/paperclip/test/processor_test.rb
- A vendor/plugins/paperclip/test/storage_test.rb
- A vendor/plugins/paperclip/test/thumbnail_test.rb
- A vendor/plugins/paperclip/test/upfile_test.rb
- R app/controllers/admin/stuff_bucks_controller.rb
- R app/controllers/admin/stuff_types_controller.rb
- R app/controllers/market_controller.rb
- R app/models/reserve.rb
- R app/models/stuff_buck.rb
- R app/models/stuff_type.rb
- R app/views/admin/stuff_bucks/_form.html.erb
- R app/views/admin/stuff_bucks/edit.html.erb
- R app/views/admin/stuff_bucks/index.html.erb
- R app/views/admin/stuff_bucks/new.html.erb
- R app/views/admin/stuff_bucks/show.html.erb
- R app/views/admin/stuff_types/_form.html.erb
- R app/views/admin/stuff_types/edit.html.erb
- R app/views/admin/stuff_types/index.html.erb
- R app/views/admin/stuff_types/new.html.erb
- R app/views/minisite/festcard09/dashboard/_bucks.html.erb
- R app/views/minisite/postcard/dashboard/_bucks.html.erb
- M .gitignore
- M app/controllers/admin/schools_controller.rb
- M app/controllers/minisite/festcard09/dashboard_controller.rb
- M app/controllers/minisite/mooncake/dashboard_controller.rb
- M app/controllers/minisite/postcard/dashboard_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/users_controller.rb
- M app/models/activity_board.rb
- M app/models/bulletin.rb
- M app/models/city_board.rb
- M app/models/mailer.rb
- M app/models/participation.rb
- M app/models/school.rb
- M app/models/school_need.rb
- M app/models/user.rb
- M app/models/visited.rb
- M app/views/admin/shared/_operation_list.erb
- M app/views/minisite/festcard09/dashboard/_schools.html.erb
- M app/views/minisite/festcard09/dashboard/new.html.erb
- M app/views/minisite/festcard09/dashboard/write_comment.html.erb
- M app/views/minisite/mooncake/dashboard/_message.html.erb
- M app/views/minisite/mooncake/dashboard/_messages.html.erb
- M app/views/minisite/mooncake/dashboard/donors.html.erb
- M app/views/minisite/mooncake/dashboard/love_message.erb
- M app/views/minisite/mooncake/dashboard/messages.html.erb
- M app/views/minisite/mooncake/dashboard/new.html.erb
- M app/views/minisite/mooncake/dashboard/write_comment.html.erb
- M app/views/minisite/postcard/dashboard/_message.erb
- M app/views/minisite/postcard/dashboard/_messages.html.erb
- M app/views/minisite/postcard/dashboard/_schools.html.erb
- M app/views/minisite/postcard/dashboard/donors.html.erb
- M app/views/minisite/postcard/dashboard/index.html.erb
- M app/views/minisite/postcard/dashboard/love_message.erb
- M app/views/minisite/postcard/dashboard/messages.html.erb
- M app/views/minisite/postcard/dashboard/school_list.html.erb
- M app/views/minisite/postcard/dashboard/write_comment.html.erb
- M app/views/schools/show.html.erb
- M app/views/users/show.html.erb
- M config/environments/development.rb
- M config/routes.rb
- M db/schema.rb
- M public/stylesheets/core.css
- M spec/fixtures/activities.yml
- M spec/fixtures/bulletins.yml
- M spec/fixtures/comments.yml
- M spec/fixtures/schools.yml
- M spec/fixtures/shares.yml
- M spec/fixtures/users.yml
- M spec/models/comment_spec.rb
- M spec/models/school_spec.rb
- M spec/models/user_spec.rb
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »