Changeset [70bcfd7bfaef7dd4d821b5948508eacbd10ebcee] by Zhang Yuanyi
2009-11-16 19:05:43 UTC
Merge branch 'dev'
http://github.com/Suave/1kg.org/commit/70bcfd7bfaef7dd4d821b5948508...
Committed by Zhang Yuanyi
- A app/controllers/school_guides_controller.rb
- A app/views/comments/_form.html.erb
- A app/views/school_guides/_form.html.erb
- A app/views/school_guides/edit.html.erb
- A app/views/school_guides/new.html.erb
- A app/views/school_guides/show.html.erb
- A app/views/schools/_shares.html.erb
- A app/views/shared/_voters.html.erb
- A app/views/users/_shares_and_guides.html.erb
- A app/views/users/_user_topics.html.erb
- A lib/tasks/comments.rake
- A public/images/more.gif
- A vendor/plugins/acts_as_paranoid/CHANGELOG
- A vendor/plugins/acts_as_paranoid/MIT-LICENSE
- A vendor/plugins/acts_as_paranoid/README
- A vendor/plugins/acts_as_paranoid/RUNNING_UNIT_TESTS
- A vendor/plugins/acts_as_paranoid/Rakefile
- A vendor/plugins/acts_as_paranoid/init.rb
- A vendor/plugins/acts_as_paranoid/lib/caboose/acts/belongs_to_with_deleted_association.rb
- A vendor/plugins/acts_as_paranoid/lib/caboose/acts/has_many_through_without_deleted_association.rb
- A vendor/plugins/acts_as_paranoid/lib/caboose/acts/paranoid.rb
- A vendor/plugins/acts_as_paranoid/lib/caboose/acts/paranoid_find_wrapper.rb
- A vendor/plugins/acts_as_paranoid/test/database.yml
- A vendor/plugins/acts_as_paranoid/test/fixtures/categories.yml
- A vendor/plugins/acts_as_paranoid/test/fixtures/categories_widgets.yml
- A vendor/plugins/acts_as_paranoid/test/fixtures/taggings.yml
- A vendor/plugins/acts_as_paranoid/test/fixtures/tags.yml
- A vendor/plugins/acts_as_paranoid/test/fixtures/widgets.yml
- A vendor/plugins/acts_as_paranoid/test/paranoid_test.rb
- A vendor/plugins/acts_as_paranoid/test/schema.rb
- A vendor/plugins/acts_as_paranoid/test/test_helper.rb
- R app/controllers/guides_controller.rb
- R app/models/activity_comment.rb
- R app/models/bulletin_comment.rb
- R app/models/guide_comment.rb
- R app/models/share_comment.rb
- R app/views/comments/_write.html.erb
- R app/views/guides/_form.html.erb
- R app/views/guides/edit.html.erb
- R app/views/guides/new.html.erb
- R app/views/guides/show.html.erb
- R app/views/misc/_latest_topics.erb
- M app/controllers/activities_controller.rb
- M app/controllers/boards_controller.rb
- M app/controllers/bulletins_controller.rb
- M app/controllers/comments_controller.rb
- M app/controllers/geos_controller.rb
- M app/controllers/groups_controller.rb
- M app/controllers/minisite/lightenschool/dashboard_controller.rb
- M app/controllers/posts_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/searches_controller.rb
- M app/controllers/shares_controller.rb
- M app/controllers/tags_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/bulletin.rb
- M app/models/comment.rb
- M app/models/group.rb
- M app/models/post.rb
- M app/models/school.rb
- M app/models/school_guide.rb
- M app/models/share.rb
- M app/models/topic.rb
- M app/models/user.rb
- M app/views/activities/show.html.erb
- M app/views/admin/misc/statistics.html.erb
- M app/views/boards/city.html.erb
- M app/views/bulletins/show.html.erb
- M app/views/comments/_comments.html.erb
- M app/views/comments/edit.html.erb
- M app/views/groups/index.html.erb
- M app/views/layouts/application.html.erb
- M app/views/minisite/lightenschool/dashboard/index.html.erb
- M app/views/schools/_guides.html.erb
- M app/views/schools/_map_lei.html.erb
- M app/views/schools/info_window.html.erb
- M app/views/schools/large_map.html.erb
- M app/views/schools/lei.html.erb
- M app/views/schools/show.html.erb
- M app/views/searches/show.html.erb
- M app/views/shares/_form.html.erb
- M app/views/shares/_shares.html.erb
- M app/views/shares/show.html.erb
- M app/views/tags/show.html.erb
- M app/views/topics/_topics.html.erb
- M app/views/users/_group_topics.html.erb
- M app/views/users/show.html.erb
- M config/routes.rb
- M db/schema.rb
- M lib/tasks/schools.rake
- M public/stylesheets/core.css
- M public/stylesheets/lei.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 »