Changeset [d079bfd5e42e8b8e44b649b0d09577c450d8e648] by Zhang Yuanyi
2009-12-28 22:43:21 UTC
Merge branch 'dev' of git@github.com:Suave/1kg.org into
dev
http://github.com/Suave/1kg.org/commit/d079bfd5e42e8b8e44b649b0d095...
Committed by Zhang Yuanyi
- 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/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/admin/groups_controller.rb
- M app/controllers/admin/stuff_bucks_controller.rb
- M app/controllers/admin/stuff_types_controller.rb
- M app/controllers/minisite/festcard09/dashboard_controller.rb
- M app/controllers/minisite/lightenschool/dashboard_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/users_controller.rb
- M app/helpers/application_helper.rb
- M app/helpers/schools_helper.rb
- M app/models/activity.rb
- M app/models/mailer.rb
- M app/models/stuff_buck.rb
- M app/models/user.rb
- M app/models/visited.rb
- M app/views/activities/_activities.erb
- M app/views/activities/_activity_by_status.erb
- M app/views/activities/_form.erb
- M app/views/activities/_local_activity.html.erb
- M app/views/activities/_travel_activity.html.erb
- M app/views/admin/stuff_bucks/index.html.erb
- M app/views/layouts/application.html.erb
- M app/views/minisite/festcard09/dashboard/_bucks.html.erb
- M app/views/minisite/lightenschool/dashboard/index.html.erb
- M app/views/minisite/lightenschool/dashboard/winners.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/_status.html.erb
- M app/views/schools/edit_basic.html.erb
- M app/views/schools/index.html.erb
- M app/views/schools/show.html.erb
- M app/views/shared/_school.erb
- M app/views/shared/_visit.html.erb
- M app/views/users/_profile_form.html.erb
- M app/views/users/_setting_tabmenu.erb
- M app/views/users/_visit.html.erb
- M app/views/users/envoy.html.erb
- M app/views/users/setting_account.html.erb
- M app/views/users/show.html.erb
- M app/views/users/visited.html.erb
- M config/routes.rb
- M db/schema.rb
- M lib/tasks/password.rake
- M lib/tasks/schools.rake
- M public/images/star.png
- M public/images/star_gary.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 »