Changeset [2a959d102508d62b9dce63edfc3c8734765645ad] by Zhang Yuanyi
2010-03-04 11:10:34 UTC
Merge branch 'master' of git@github.com:Suave/1kg.org
http://github.com/Suave/1kg.org/commit/2a959d102508d62b9dce63edfc3c...
Committed by Zhang Yuanyi
- A app/views/groups/topics.html.erb
- A app/views/schools/edit_mainphoto.html.erb
- A app/views/shared/_login.html.erb
- A app/views/shared/_photo.html.erb
- A app/views/shared/_record.html.erb
- A app/views/shared/_stopic.html.erb
- A app/views/topics/total.html.erb
- A public/images/activity_channel.png
- A public/images/ad/cnbloggercon09.jpg
- A public/images/ad/mooncake.jpg
- A public/images/ad/postcard.jpg
- A public/images/border.gif
- A public/images/group_channel.png
- A public/images/school_channel.png
- A public/images/school_main_set.png
- A public/images/selected.gif
- A public/images/title.jpg
- R app/views/shared/_current_user_profile.erb
- R public/images/announce/festcard09.jpg
- R public/images/announce/intro.jpg
- R public/images/announce/kuailebox.jpg
- R public/images/announce/lightenschool.jpg
- M app/controllers/activities_controller.rb
- M app/controllers/groups_controller.rb
- M app/controllers/misc_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/topics_controller.rb
- M app/controllers/users_controller.rb
- M app/helpers/application_helper.rb
- M app/models/activity.rb
- M app/models/board.rb
- M app/models/photo.rb
- M app/models/post.rb
- M app/models/share.rb
- M app/models/topic.rb
- M app/models/user.rb
- M app/models/visited.rb
- M app/views/activities/category.html.erb
- M app/views/activities/index.html.erb
- M app/views/activities/ongoing.html.erb
- M app/views/activities/over.html.erb
- M app/views/activities/show.html.erb
- M app/views/groups/index.html.erb
- M app/views/groups/show.html.erb
- M app/views/layouts/application.html.erb
- M app/views/misc/index.html.erb
- M app/views/misc/welcome.html.erb
- M app/views/schools/_need_tag_cloud.html.erb
- M app/views/schools/_school_steps.html.erb
- M app/views/schools/_status.html.erb
- M app/views/schools/comments.html.erb
- M app/views/schools/edit_basic.html.erb
- M app/views/schools/edit_need.html.erb
- M app/views/schools/edit_other.html.erb
- M app/views/schools/edit_traffic.html.erb
- M app/views/schools/index.html.erb
- M app/views/schools/new.html.erb
- M app/views/schools/show.html.erb
- M app/views/sessions/new.html.erb
- M app/views/shared/_activity.erb
- M app/views/shared/_search_box.html.erb
- M app/views/shared/_share.erb
- M app/views/shared/_topic.html.erb
- M app/views/shared/_visit.html.erb
- M app/views/shared/_voters.html.erb
- M app/views/shares/show.html.erb
- M app/views/topics/show.html.erb
- M app/views/users/_group_topics.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/new.html.erb
- M config/routes.rb
- M db/schema.rb
- M lib/tasks/misc.rake
- M public/images/ad/festcard09.jpg
- M public/images/ad/kuailebox.jpg
- M public/images/ad/lightenschool.jpg
- M public/images/bottom-left.png
- M public/images/bottom-right.png
- M public/images/festcard09/festcard.jpg
- M public/images/festcard09/love.png
- M public/images/navigation.gif
- M public/images/school_main.png
- M public/images/school_main_thumb.png
- M public/images/top-left.png
- M public/images/top-right.png
- M public/stylesheets/core.css
- M public/stylesheets/school.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 »