Changeset [d0977be06d6ec1a831a60991445183ee212d5bdc] by Zhang Yuanyi
2010-06-17 16:52:55 UTC
Merge branch 'dev' of git@github.com:Suave/1kg.org into
dev
http://github.com/Suave/1kg.org/commit/d0977be06d6ec1a831a609914451...
Committed by Zhang Yuanyi
- A app/controllers/admin/co_donations_controller.rb
- A app/views/admin/co_donations/index.html.erb
- A app/views/co_donations/_state.html.erb
- A app/views/shared/_activity.html.erb
- R app/views/shared/_activity.erb
- M app/controllers/co_donations_controller.rb
- M app/controllers/sub_donations_controller.rb
- M app/models/co_donation.rb
- M app/models/sub_donation.rb
- M app/views/activities/_form.html.erb
- M app/views/activities/show.html.erb
- M app/views/admin/shared/_operation_list.erb
- M app/views/co_donations/_form.html.erb
- M app/views/co_donations/index.html.erb
- M app/views/co_donations/new.html.erb
- M app/views/co_donations/show.html.erb
- M app/views/requirement_types/show.html.erb
- M app/views/requirements/school.html.erb
- M app/views/shared/_sub_donation.html.erb
- M app/views/sub_donations/edit.html.erb
- M config/routes.rb
- M db/schema.rb
- M public/stylesheets/core.css
- M vendor/plugins/rails-widgets/lib/widgets/progressbar.css.erb
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »