Changeset [7ca4bfae5f2489438a52a03ce297d7158010b7b1] by Shawn Balestracci

November 26th, 2008 @ 02:41 PM

Merge branch 'master' of git://github.com/vegantech/sims http://github.com/vegantech/sims...

Committed by Shawn Balestracci

  • M app/cells/principal_overrides/principal_responses.html.erb
  • M app/cells/principal_overrides/user_requests.html.erb
  • M app/cells/principal_overrides_cell.rb
  • M app/controllers/interventions/comments_controller.rb
  • M app/controllers/interventions/participants_controller.rb
  • M app/controllers/interventions_controller.rb
  • M app/controllers/principal_overrides_controller.rb
  • M app/models/intervention.rb
  • M app/models/intervention_comment.rb
  • M app/models/intervention_participant.rb
  • M app/models/notifications.rb
  • M app/models/principal_override.rb
  • M app/models/special_user_group.rb
  • M app/models/student.rb
  • M app/models/tier.rb
  • M app/models/user.rb
  • M app/models/user_group_assignment.rb
  • M app/views/interventions/_participant.html.erb
  • M app/views/interventions/_participants.html.erb
  • M app/views/interventions/comments/edit.html.erb
  • M app/views/interventions/comments/index.html.erb
  • M app/views/interventions/comments/new.html.erb
  • M app/views/interventions/participants/edit.html.erb
  • M app/views/interventions/participants/index.html.erb
  • M app/views/interventions/participants/new.html.erb
  • M app/views/interventions/participants/show.html.erb
  • M app/views/interventions/show.html.erb
  • M app/views/layouts/_menu.html.erb
  • M app/views/layouts/application.html.erb
  • M app/views/notifications/intervention_starting.erb
  • M app/views/notifications/principal_override_response.erb
  • M app/views/principal_overrides/_edit.html.erb
  • M app/views/principal_overrides/_layout.html.erb
  • M app/views/principal_overrides/_override.html.erb
  • M app/views/principal_overrides/create.js.rjs
  • M app/views/principal_overrides/destroy.js.rjs
  • M app/views/principal_overrides/edit.html.erb
  • M app/views/principal_overrides/index.html.erb
  • M app/views/principal_overrides/new.html.erb
  • M config/environment.rb
  • M config/routes.rb
  • M db/migrate/20081111051647_create_principal_overrides.rb
  • M db/migrate/20081125030310_create_intervention_comments.rb
  • M db/schema.rb
  • M features/sims_demo_walkthrough.feature
  • M spec/controllers/interventions/comments_controller_spec.rb
  • M spec/controllers/interventions/comments_routing_spec.rb
  • M spec/controllers/interventions/participants_controller_spec.rb
  • M spec/controllers/interventions/participants_routing_spec.rb
  • M spec/controllers/interventions_controller_spec.rb
  • M spec/controllers/principal_overrides_controller_spec.rb
  • M spec/fixtures/intervention_comments.yml
  • M spec/lib/all_controllers_spec.rb
  • M spec/models/intervention_comment_spec.rb
  • M spec/models/principal_override_spec.rb
  • M spec/views/intervention_comments/edit.html.erb_spec.rb
  • M spec/views/intervention_comments/index.html.erb_spec.rb
  • M spec/views/intervention_comments/new.html.erb_spec.rb
  • M spec/views/intervention_comments/show.html.erb_spec.rb
  • M test/fixtures/rights.yml
  • M test/fixtures/users.yml
  • M vendor/plugins/cells/CHANGES
  • M vendor/plugins/cells/README.rdoc
  • M vendor/plugins/cells/Rakefile
  • M vendor/plugins/cells/about.yml
  • M vendor/plugins/cells/app/cells/test/_broken_partial.html.erb
  • M vendor/plugins/cells/app/cells/test/_test_list.html.erb
  • M vendor/plugins/cells/app/cells/unknown_cell.rb
  • M vendor/plugins/cells/boot.rb
  • M vendor/plugins/cells/generators/cell/USAGE
  • M vendor/plugins/cells/generators/cell/cell_generator.rb
  • M vendor/plugins/cells/generators/cell/templates/cell.rb
  • M vendor/plugins/cells/generators/cell/templates/view.html.erb
  • M vendor/plugins/cells/init.rb
  • M vendor/plugins/cells/install.rb
  • M vendor/plugins/cells/lib/action_view_extensions.rb
  • M vendor/plugins/cells/lib/cell.rb
  • M vendor/plugins/cells/lib/cell/caching.rb
  • M vendor/plugins/cells/lib/cell/template_finder.rb
  • M vendor/plugins/cells/lib/cell_extensions.rb
  • M vendor/plugins/cells/test/caching_test.rb
  • M vendor/plugins/cells/test/cells/cells_test_one/renamed_instance_view.html.erb
  • M vendor/plugins/cells/test/cells/cells_test_one/super_state.html.erb
  • M vendor/plugins/cells/test/cells/cells_test_one_cell.rb
  • M vendor/plugins/cells/test/cells/cells_test_two_cell.rb
  • M vendor/plugins/cells/test/cells/my_test/_broken_partial.html.erb
  • M vendor/plugins/cells/test/cells/my_test/_partial.html.erb
  • M vendor/plugins/cells/test/cells/my_test/view_containing_broken_partial.html.erb
  • M vendor/plugins/cells/test/cells/my_test/view_containing_nonexistant_partial.html.erb
  • M vendor/plugins/cells/test/cells/my_test/view_containing_partial.html.erb
  • M vendor/plugins/cells/test/cells/my_test/view_in_local_test_views_dir.html.erb
  • M vendor/plugins/cells/test/cells/my_test/view_with_explicit_english_translation.html.erb
  • M vendor/plugins/cells/test/cells/my_test/view_with_explicit_english_translation_en.html.erb
  • M vendor/plugins/cells/test/cells/really_module/nested/happy_state.html.erb
  • M vendor/plugins/cells/test/cells/really_module/nested_cell.rb
  • M vendor/plugins/cells/test/cells/simple/two_templates_state.html.mytpl
  • M vendor/plugins/cells/test/cells/simple_cell.rb
  • M vendor/plugins/cells/test/cells/test_cell.rb
  • M vendor/plugins/cells/test/cells_test.rb
  • M vendor/plugins/cells/test/helper_test.rb
  • M vendor/plugins/cells/test/helpers/helper_using_cell_helper.rb
  • M vendor/plugins/cells/test/testing_helper.rb
  • M vendor/plugins/cells/test/views/_test_list.html.erb
  • M vendor/plugins/cells/test/views/a_cell_template.html.erb
  • M vendor/plugins/cells/test/views/a_cell_template_file.html.erb
  • M vendor/plugins/cells/test/views/another_rendering_state.html.erb
  • M vendor/plugins/cells/test/views/just_one_view.html.erb
  • M vendor/plugins/cells/test/views/rendering_state.html.erb
  • M vendor/plugins/cells/test/views/reset_state.html.erb
  • M vendor/plugins/cells/test/views/setting_state.html.erb
  • M vendor/plugins/cells/test/views/state_using_another_helper.html.erb
  • M vendor/plugins/cells/test/views/state_using_application_helper.html.erb
  • M vendor/plugins/cells/test/views/state_with_automatic_helper_invocation.html.erb
  • M vendor/plugins/cells/test/views/state_with_helper_invocation.html.erb
  • M vendor/plugins/cells/test/views/state_with_helper_method_invocation.html.erb
  • M vendor/plugins/cells/test/views/state_with_link_to.html.erb
  • M vendor/plugins/cells/test/views/state_with_not_included_helper_method.html.erb
  • M vendor/plugins/cells/test/views/view_with_render_cell_invocation.html.erb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

Student Intervention Monitoring System

Shared Ticket Bins