Changeset [87ed1fdded074fe59e3d490279d21a4988a57f8e] by Suave Su
2009-09-09 17:35:17 UTC
Merge branch 'dev'
Conflicts:
app/controllers/minisite/mooncake/dashboard_controller.rb
http://github.com/Suave/1kg.org/commit/87ed1fdded074fe59e3d490279d2...
Committed by Suave Su
- A app/controllers/minisite/lightenschool/dashboard_controller.rb
- A app/helpers/fusioncharts_helper.rb
- A app/helpers/minisite/mooncake/dashboard_helper.rb
- A app/models/school_snapshot.rb
- A app/views/admin/groups/edit.html.erb
- A app/views/mailer/create_default_user_for_mooncake.erb
- A app/views/minisite/lightenschool/dashboard/index.html.erb
- A app/views/minisite/mooncake/dashboard/_head.html.erb
- A app/views/minisite/mooncake/dashboard/_intro.html.erb
- A app/views/minisite/mooncake/dashboard/_message.html.erb
- A app/views/minisite/mooncake/dashboard/_messages.html.erb
- A app/views/minisite/mooncake/dashboard/_partner.html.erb
- A app/views/minisite/mooncake/dashboard/comment.html.erb
- A app/views/minisite/mooncake/dashboard/donors.html.erb
- A app/views/minisite/mooncake/dashboard/messages.html.erb
- A app/views/minisite/mooncake/dashboard/write_comment.html.erb
- A app/views/schools/_popular_schools.html.erb
- A app/views/schools/large_map.html.erb
- A lib/fusion_chart.rb
- A lib/stuff_util.rb
- A public/images/lightenschool/button.png
- A public/images/mooncake/congratulation.jpg
- A public/images/mooncake/flow.png
- A public/images/mooncake/password.png
- A public/images/mooncake/progress0.jpg
- A public/images/mooncake/progress1.jpg
- A public/images/mooncake/progress10.jpg
- A public/images/mooncake/progress2.jpg
- A public/images/mooncake/progress3.jpg
- A public/images/mooncake/progress4.jpg
- A public/images/mooncake/progress5.jpg
- A public/images/mooncake/progress6.jpg
- A public/images/mooncake/progress7.jpg
- A public/images/mooncake/progress8.jpg
- A public/images/mooncake/progress9.jpg
- A public/images/mooncake/smile.jpg
- A public/images/mooncake/thanks.jpg
- A public/javascripts/FusionCharts.js
- A public/javascripts/swfobject.js
- A public/stylesheets/lightenschool.css
- A public/swfs/FCF_Area2D.swf
- A public/swfs/FCF_Bar2D.swf
- A public/swfs/FCF_Candlestick.swf
- A public/swfs/FCF_Column2D.swf
- A public/swfs/FCF_Column3D.swf
- A public/swfs/FCF_Doughnut2D.swf
- A public/swfs/FCF_Funnel.swf
- A public/swfs/FCF_Gantt.swf
- A public/swfs/FCF_Line.swf
- A public/swfs/FCF_MSArea2D.swf
- A public/swfs/FCF_MSBar2D.swf
- A public/swfs/FCF_MSColumn2D.swf
- A public/swfs/FCF_MSColumn2DLineDY.swf
- A public/swfs/FCF_MSColumn3D.swf
- A public/swfs/FCF_MSColumn3DLineDY.swf
- A public/swfs/FCF_MSLine.swf
- A public/swfs/FCF_Pie2D.swf
- A public/swfs/FCF_Pie3D.swf
- A public/swfs/FCF_StackedArea2D.swf
- A public/swfs/FCF_StackedBar2D.swf
- A public/swfs/FCF_StackedColumn2D.swf
- A public/swfs/FCF_StackedColumn3D.swf
- A spec/fixtures/school_snapshots.yml
- A spec/fixtures/schools.yml
- A spec/models/school_snapshot_spec.rb
- A spec/models/school_spec.rb
- R app/views/minisite/mooncake/dashboard/buy.html.erb
- R app/views/minisite/mooncake/dashboard/reserve.html.erb
- R app/views/shared/_warmfund.html.erb
- R db/migrate/20081009072037_create_users.rb
- R db/migrate/20090430155946_add_init_migration.rb
- M .gitignore
- M app/controllers/admin/groups_controller.rb
- M app/controllers/admin/stuff_types_controller.rb
- M app/controllers/application_controller.rb
- M app/controllers/groups_controller.rb
- M app/controllers/minisite/mooncake/dashboard_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/sessions_controller.rb
- M app/controllers/users_controller.rb
- M app/helpers/application_helper.rb
- M app/models/mailer.rb
- M app/models/school.rb
- M app/views/admin/groups/index.html.erb
- M app/views/admin/groups/new.html.erb
- M app/views/admin/stuff_bucks/index.html.erb
- M app/views/admin/stuff_types/index.html.erb
- M app/views/groups/index.html.erb
- M app/views/layouts/application.html.erb
- M app/views/minisite/mooncake/dashboard/new.html.erb
- M app/views/minisite/postcard/dashboard/index.html.erb
- M app/views/misc/index.html.erb
- M app/views/schools/_school_map.html.erb
- M app/views/schools/index.html.erb
- M app/views/schools/show.html.erb
- M config/deploy.rb
- M config/routes.rb
- M db/schema.rb
- M lib/tasks/schools.rake
- M public/stylesheets/core.css
- M public/stylesheets/mooncake.css
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »