Changeset [807f12630c2f7df06f9bd1dd8510faafedeb8cd9] by Suave Su
2009-12-10 17:42:39 UTC
Merge branch 'dev' of git@github.com:Suave/1kg.org into
mall
http://github.com/Suave/1kg.org/commit/807f12630c2f7df06f9bd1dd8510...
Committed by Suave Su
- A app/views/schools/show_old.html.erb
- A app/views/shared/_wanna.html.erb
- A lib/editable.rb
- A public/images/adminbutton.gif
- A public/images/less.gif
- A public/stylesheets/school.css
- A spec/controllers/comments_controller_spec.rb
- A spec/controllers/school_guides_controller_spec.rb
- A spec/fixtures/activities.yml
- A spec/fixtures/bulletins.yml
- A spec/fixtures/comments.yml
- A spec/fixtures/shares.yml
- A spec/lib/editable_spec.rb
- A spec/models/comment_spec.rb
- A vendor/plugins/bullet/MIT-LICENSE
- A vendor/plugins/bullet/README.textile
- A vendor/plugins/bullet/Rakefile
- A vendor/plugins/bullet/VERSION
- A vendor/plugins/bullet/bullet.gemspec
- A vendor/plugins/bullet/lib/bullet.rb
- A vendor/plugins/bullet/lib/bullet/action_controller.rb
- A vendor/plugins/bullet/lib/bullet/active_record.rb
- A vendor/plugins/bullet/lib/bullet/association.rb
- A vendor/plugins/bullet/lib/bullet/counter.rb
- A vendor/plugins/bullet/lib/bullet/logger.rb
- A vendor/plugins/bullet/lib/bullet/notification.rb
- A vendor/plugins/bullet/lib/bulletware.rb
- A vendor/plugins/bullet/rails/init.rb
- A vendor/plugins/bullet/spec/bullet/association_for_chris_spec.rb
- A vendor/plugins/bullet/spec/bullet/association_spec.rb
- A vendor/plugins/bullet/spec/bullet/counter_spec.rb
- A vendor/plugins/bullet/spec/spec.opts
- A vendor/plugins/bullet/spec/spec_helper.rb
- A vendor/plugins/bullet/tasks/bullet_tasks.rake
- R app/views/schools/lei.html.erb
- R public/stylesheets/lei.css
- R public/user/avatar/1/large/suave.jpg
- R public/user/avatar/1/medium/suave.jpg
- R public/user/avatar/1/small/suave.jpg
- R public/user/avatar/1/suave.jpg
- R spec/controllers/guides_controller_spec.rb
- R test/performance/browsing_test.rb
- R test/performance/test_helper.rb
- R test/test_helper.rb
- M Rakefile
- M app/controllers/activities_controller.rb
- M app/controllers/admin/users_controller.rb
- M app/controllers/application_controller.rb
- M app/controllers/boards_controller.rb
- M app/controllers/comments_controller.rb
- M app/controllers/groups_controller.rb
- M app/controllers/misc_controller.rb
- M app/controllers/school_guides_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/sessions_controller.rb
- M app/controllers/shares_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/activity_board.rb
- M app/models/board.rb
- M app/models/bulletin.rb
- M app/models/city_board.rb
- M app/models/comment.rb
- M app/models/county.rb
- M app/models/geo.rb
- M app/models/group.rb
- M app/models/message.rb
- M app/models/neighborhood.rb
- M app/models/page.rb
- M app/models/participation.rb
- M app/models/photo.rb
- M app/models/post.rb
- M app/models/profile.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_contact.rb
- M app/models/school_finder.rb
- M app/models/school_guide.rb
- M app/models/school_local.rb
- M app/models/school_need.rb
- M app/models/school_snapshot.rb
- M app/models/school_traffic.rb
- M app/models/search.rb
- M app/models/share.rb
- M app/models/stuff.rb
- M app/models/stuff_buck.rb
- M app/models/topic.rb
- M app/models/user.rb
- M app/models/visited.rb
- M app/models/vote.rb
- M app/views/activities/_activities.erb
- M app/views/activities/_activity_by_status.erb
- M app/views/activities/_form.erb
- M app/views/activities/_local_activity.html.erb
- M app/views/activities/_travel_activity.html.erb
- M app/views/activities/edit.html.erb
- M app/views/activities/new.html.erb
- M app/views/activities/show.html.erb
- M app/views/admin/schools/_import_form.html.erb
- M app/views/comments/_form.html.erb
- M app/views/comments/edit.html.erb
- M app/views/groups/_groups.html.erb
- M app/views/layouts/application.html.erb
- M app/views/mailer/invalid_school_notification.erb
- M app/views/mailer/submitted_school_notification.erb
- M app/views/minisite/festcard09/dashboard/_share.html.erb
- M app/views/minisite/lightenschool/dashboard/index.html.erb
- M app/views/minisite/mooncake/dashboard/_intro.html.erb
- M app/views/minisite/mooncake/dashboard/new.html.erb
- M app/views/misc/index.html.erb
- M app/views/photos/new.html.erb
- M app/views/school_guides/show.html.erb
- M app/views/schools/_map_lei.html.erb
- M app/views/schools/_school_map.html.erb
- M app/views/schools/_status.html.erb
- M app/views/schools/edit_other.html.erb
- M app/views/schools/index.html.erb
- M app/views/schools/large_map.html.erb
- M app/views/schools/show.html.erb
- M app/views/shared/_footer.erb
- M app/views/shared/_visit.html.erb
- M app/views/shares/show.html.erb
- M app/views/topics/show.html.erb
- M app/views/users/show.html.erb
- M config/environment.rb
- M config/environments/development.rb
- M config/routes.rb
- M db/schema.rb
- M lib/authenticated_system.rb
- M lib/body_format.rb
- M public/images/school_main.png
- M public/images/school_main_thumb.png
- M public/javascripts/calendar.js
- M public/stylesheets/core.css
- M public/stylesheets/lightenschool.css
- M public/stylesheets/mooncake.css
- M spec/fixtures/school_guides.yml
- M spec/fixtures/school_snapshots.yml
- M spec/fixtures/schools.yml
- M spec/fixtures/users.yml
- M spec/models/school_basic_spec.rb
- M spec/models/school_guide_spec.rb
- M spec/models/school_snapshot_spec.rb
- M spec/models/school_spec.rb
- M spec/models/user_spec.rb
- M vendor/plugins/active-rbac/lib/active_rbac/acts_as_user.rb
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »