Changeset [00b17c89190f153f32348ffa09722da395222c8e] by Zhang Yuanyi
2010-05-17 23:46:50 UTC
Merge branch 'dev' of git@github.com:Suave/1kg.org into
dev
http://github.com/Suave/1kg.org/commit/00b17c89190f153f32348ffa0972...
Committed by Zhang Yuanyi
- A app/controllers/admin/blogs_controller.rb
- A app/controllers/blogs_controller.rb
- A app/helpers/requirement_types_helper.rb
- A app/models/blog.rb
- A app/views/admin/blogs/_form.erb
- A app/views/admin/blogs/edit.html.erb
- A app/views/admin/blogs/index.html.erb
- A app/views/admin/blogs/new.html.erb
- A app/views/blogs/index.html.erb
- A app/views/blogs/show.html.erb
- A app/views/layouts/blogs.html.erb
- A app/views/requirement_types/_requirement.html.erb
- M .gitignore
- M app/controllers/activities_controller.rb
- M app/controllers/admin/requirement_types_controller.rb
- M app/controllers/requirement_types_controller.rb
- M app/helpers/schools_helper.rb
- M app/models/activity.rb
- M app/models/requirement.rb
- M app/models/requirement_type.rb
- M app/views/activities/_form.html.erb
- M app/views/admin/shared/_operation_list.erb
- M app/views/layouts/application.html.erb
- 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/searches/_search_box.html.erb
- M app/views/shares/show.html.erb
- M config/deploy.rb
- M config/environments/development.rb
- M config/routes.rb
- M db/schema.rb
- M public/javascripts/application.js
- 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 »