Changeset [b96068783c95b3c63783dab8487d26fddcfd4b56] by Zhang Yuanyi
2010-05-20 11:12:15 UTC
Merge branch 'dev' of git@github.com:Suave/1kg.org into
dev
http://github.com/Suave/1kg.org/commit/b96068783c95b3c63783dab8487d...
Committed by Zhang Yuanyi
- A public/images/atom.gif
- A public/images/pp.png
- R app/controllers/admin/blogs_controller.rb
- R app/controllers/blogs_controller.rb
- R app/models/blog.rb
- R app/views/admin/blogs/_form.erb
- R app/views/admin/blogs/edit.html.erb
- R app/views/admin/blogs/index.html.erb
- R app/views/admin/blogs/new.html.erb
- R app/views/blogs/index.html.erb
- R app/views/blogs/show.html.erb
- R app/views/layouts/blogs.html.erb
- R public/images/xianguo.gif
- R public/images/zhuaxia.gif
- M app/controllers/activities_controller.rb
- M app/controllers/admin/requirement_types_controller.rb
- M app/controllers/comments_controller.rb
- M app/controllers/groups_controller.rb
- M app/controllers/misc_controller.rb
- M app/controllers/requirement_types_controller.rb
- M app/controllers/requirements_controller.rb
- M app/controllers/shares_controller.rb
- M app/controllers/topics_controller.rb
- M app/models/activity.rb
- M app/models/requirement.rb
- M app/views/activities/index.atom.builder
- M app/views/activities/index.html.erb
- M app/views/activities/over.html.erb
- M app/views/activities/show.html.erb
- M app/views/admin/shared/_operation_list.erb
- M app/views/geos/show.html.erb
- M app/views/groups/index.atom.builder
- M app/views/groups/index.html.erb
- M app/views/misc/index.atom.builder
- M app/views/misc/index.html.erb
- M app/views/requirement_types/_form.html.erb
- M app/views/requirement_types/show.html.erb
- M app/views/requirements/new.html.erb
- M app/views/requirements/school.html.erb
- M app/views/schools/index.atom.builder
- M app/views/schools/index.html.erb
- M app/views/schools/large_map.html.erb
- M app/views/sessions/ajax_login.html.erb
- M app/views/shared/_atom.html.erb
- M app/views/shares/show.html.erb
- M app/views/tags/needs.html.erb
- M app/views/topics/show.html.erb
- M app/views/users/edit.html.erb
- M app/views/users/show.html.erb
- M config/routes.rb
- M db/schema.rb
- M lib/body_format.rb
- M public/images/rss.png
- M public/javascripts/application.js
- M public/stylesheets/core.css
- M vendor/plugins/tiny_mce/lib/tiny_mce/assets/tiny_mce/plugins/advimage/image.htm
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »