Changeset [d80beb4db824dd0f55290449f76d6dd28a7858d1] by Suave Su
2009-11-27 20:09:20 UTC
Merge branch 'master' into mall
http://github.com/Suave/1kg.org/commit/d80beb4db824dd0f55290449f76d...
Committed by Suave Su
- A app/controllers/minisite/festcard09/dashboard_controller.rb
- A app/controllers/school_guides_controller.rb
- A app/views/comments/_form.html.erb
- A app/views/mailer/destroyed_school_notification.erb
- A app/views/mailer/invalid_school_notification.erb
- A app/views/minisite/festcard09/dashboard/_bucks.html.erb
- A app/views/minisite/festcard09/dashboard/_share.html.erb
- A app/views/minisite/festcard09/dashboard/cards.html.erb
- A app/views/minisite/festcard09/dashboard/index.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/_map_lei.html.erb
- A app/views/schools/_shares.html.erb
- A app/views/shared/_voters.html.erb
- A app/views/tags/_tags.html.erb
- A app/views/tags/needs.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/docs/avatars.zip
- A public/docs/festcard09.rar
- A public/images/ad/festcard09.jpg
- A public/images/announce/festcard09.jpg
- A public/images/festcard09/avatar_large.jpg
- A public/images/festcard09/avatar_large2.jpg
- A public/images/festcard09/avatar_large3.jpg
- A public/images/festcard09/banner.gif
- A public/images/festcard09/card1a.jpg
- A public/images/festcard09/card1b.jpg
- A public/images/festcard09/card2a.jpg
- A public/images/festcard09/card2b.jpg
- A public/images/festcard09/card3a.jpg
- A public/images/festcard09/card3b.jpg
- A public/images/festcard09/card4a.jpg
- A public/images/festcard09/card4b.jpg
- A public/images/festcard09/festcard.jpg
- A public/images/festcard09/flow.png
- A public/images/festcard09/love.png
- A public/images/more.gif
- A public/images/school_main_thumb.png
- A public/stylesheets/festcard09.css
- 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/minisite/mooncake/dashboard_controller.rb
- M app/controllers/misc_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/topics_controller.rb
- M app/controllers/users_controller.rb
- M app/helpers/application_helper.rb
- M app/helpers/schools_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/mailer.rb
- M app/models/photo.rb
- M app/models/post.rb
- M app/models/public_board.rb
- M app/models/school.rb
- M app/models/school_basic.rb
- M app/models/school_board.rb
- M app/models/school_guide.rb
- M app/models/school_need.rb
- M app/models/school_observer.rb
- M app/models/school_traffic.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/show.html.erb
- M app/views/admin/bulletins/_form.html.erb
- M app/views/admin/misc/statistics.html.erb
- M app/views/admin/schools/_import_form.html.erb
- M app/views/admin/schools/import.html.erb
- M app/views/boards/city.html.erb
- M app/views/boards/public_issue.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/geos/index.html.erb
- M app/views/geos/show.html.erb
- M app/views/groups/index.html.erb
- M app/views/layouts/application.html.erb
- M app/views/mailer/submitted_school_notification.erb
- M app/views/minisite/lightenschool/dashboard/index.html.erb
- M app/views/minisite/mooncake/dashboard/new.html.erb
- M app/views/minisite/postcard/dashboard/index.html.erb
- M app/views/misc/_need_tag_cloud.html.erb
- M app/views/misc/index.html.erb
- M app/views/misc/welcome.html.erb
- M app/views/schools/_guides.html.erb
- M app/views/schools/_last_10_updated_topics.erb
- M app/views/schools/_school_steps.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/info_window.html.erb
- M app/views/schools/large_map.html.erb
- M app/views/schools/lei.html.erb
- M app/views/schools/new.html.erb
- M app/views/schools/show.html.erb
- M app/views/searches/show.html.erb
- M app/views/shared/_ad.erb
- M app/views/shared/_search_box.html.erb
- M app/views/shared/_visit.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/deploy.rb
- M config/routes.rb
- M db/schema.rb
- M lib/school_import.rb
- M lib/tasks/password.rake
- M lib/tasks/schools.rake
- M public/javascripts/application.js
- M public/school_info.xls
- 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 »