Changeset [3076e9f03a7503f67d0f2152cad83732bfef29e6] by Suave Su
2010-01-20 00:02:35 UTC
Merge branch 'master' of git@github.com:Suave/1kg.org
http://github.com/Suave/1kg.org/commit/3076e9f03a7503f67d0f2152cad8...
Committed by Suave Su
- A app/views/admin/schools/merging.html.erb
- A public/images/icon/douban.gif
- A public/images/icon/kaixin001.gif
- A public/images/icon/messenger.gif
- A public/images/icon/qq.gif
- A public/images/icon/renren.gif
- A public/images/icon/skype.gif
- A public/images/icon/twitter.gif
- R public/images/joyent.jpg
- M app/controllers/admin/schools_controller.rb
- M app/controllers/misc_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/shares_controller.rb
- M app/controllers/users_controller.rb
- M app/helpers/application_helper.rb
- M app/models/group.rb
- M app/models/profile.rb
- M app/models/school.rb
- M app/models/share.rb
- M app/views/admin/shared/_operation_list.erb
- M app/views/misc/index.html.erb
- M app/views/users/_profile.html.erb
- M app/views/users/_profile_form.html.erb
- M app/views/users/_setting_tabmenu.erb
- M app/views/users/setting_avatar.html.erb
- M app/views/users/setting_profile.html.erb
- M app/views/users/show.html.erb
- M config/routes.rb
- M db/schema.rb
- M lib/body_format.rb
- M public/stylesheets/core.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 »