Changeset [dd6b2bddb450f77696f5407b1c03ffa0696bcdb4] by makestory
2009-12-18 23:14:24 UTC
Merge branch 'master' of git@github.com:Suave/1kg.org into
dashi
http://github.com/Suave/1kg.org/commit/dd6b2bddb450f77696f5407b1c03...
Committed by makestory
- A app/views/mailer/create_default_user_for_festcard09.erb
- A app/views/minisite/festcard09/dashboard/_head.html.erb
- A app/views/minisite/festcard09/dashboard/_schools.html.erb
- A app/views/minisite/festcard09/dashboard/comment.html.erb
- A app/views/minisite/festcard09/dashboard/new.html.erb
- A app/views/minisite/festcard09/dashboard/write_comment.html.erb
- A app/views/minisite/lightenschool/dashboard/winners.html.erb
- A app/views/minisite/mooncake/dashboard/_signup_and_login.html.erb
- A public/images/lightenschool/help.png
- R app/views/minisite/festcard09/dashboard/index.html.erb
- M .gitignore
- M app/controllers/activities_controller.rb
- M app/controllers/admin/groups_controller.rb
- M app/controllers/admin/stuff_bucks_controller.rb
- M app/controllers/admin/stuff_types_controller.rb
- M app/controllers/groups_controller.rb
- M app/controllers/minisite/festcard09/dashboard_controller.rb
- M app/controllers/minisite/lightenschool/dashboard_controller.rb
- M app/models/mailer.rb
- M app/models/neighborhood.rb
- M app/models/stuff_buck.rb
- M app/models/visited.rb
- M app/views/activities/_form.erb
- M app/views/admin/stuff_bucks/index.html.erb
- M app/views/minisite/festcard09/dashboard/_bucks.html.erb
- M app/views/minisite/lightenschool/dashboard/index.html.erb
- M app/views/minisite/mooncake/dashboard/write_comment.html.erb
- M app/views/minisite/postcard/dashboard/school_list.html.erb
- M app/views/schools/edit_basic.html.erb
- M app/views/schools/index.html.erb
- M app/views/shared/_share.erb
- M config/routes.rb
- M db/schema.rb
- M lib/tasks/password.rake
- M lib/tasks/schools.rake
- M public/images/buttonlink.gif
- M public/images/school_main.png
- M public/images/school_main_thumb.png
- M public/stylesheets/core.css
- M public/stylesheets/festcard09.css
- M public/stylesheets/lightenschool.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 »