Changeset [917664b9fd90bd2e8ae9e98061122ed8aacf4686] by Zhang Yuanyi
2010-01-18 17:01:54 UTC
Merge branch 'master' of git@github.com:Suave/1kg.org
http://github.com/Suave/1kg.org/commit/917664b9fd90bd2e8ae9e9806112...
Committed by Zhang Yuanyi
- A app/views/schools/apply.html.erb
- A app/views/shared/_topic.html.erb
- A app/views/users/friends.html.erb
- A app/views/users/participated_topics.html.erb
- R app/views/users/neighbors.html.erb
- M app/controllers/photos_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/sessions_controller.rb
- M app/controllers/users_controller.rb
- M app/models/user.rb
- M app/views/activities/show.html.erb
- M app/views/layouts/application.html.erb
- M app/views/minisite/festcard09/dashboard/new.html.erb
- M app/views/misc/index.html.erb
- M app/views/schools/moderator.html.erb
- M app/views/schools/show.html.erb
- M app/views/shared/_activity.erb
- M app/views/users/_activities.html.erb
- M app/views/users/_groups.html.erb
- M app/views/users/_profile.html.erb
- M app/views/users/_shares.html.erb
- M app/views/users/_user_topics.html.erb
- M app/views/users/groups.html.erb
- M app/views/users/participated_activities.html.erb
- M app/views/users/shares.html.erb
- M app/views/users/show.html.erb
- M app/views/users/submitted_activities.html.erb
- M app/views/users/submitted_topics.html.erb
- M config/routes.rb
- M lib/tasks/password.rake
- M public/stylesheets/core.css
- M public/stylesheets/school.css
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »