Changeset [a51a80ddf3a8af1d2bff0e894102bc807b7ae3a4] by Shawn Balestracci
Revision a51a80ddf3a8af1d2bff0e894102bc807b7ae3a4,
committed by Shawn Balestracci
· January 9th, 2012 @ 06:26 PM
Merge branch 'master' into 2.3bundler
https://github.com/vegantech/sims/commit/a51a80ddf3a8af1d2bff0e8941...
82 changed files
-
A
.metrics -
A
app/controllers/interventions/quicklists_controller.rb -
A
app/models/probe_graph.rb -
A
app/views/interventions/quicklists/_quicklist.html.erb -
A
app/views/interventions/quicklists/index.html.erb -
A
app/views/interventions/quicklists/index.js.rjs -
A
features/regular_user/checklist.feature -
A
features/regular_user/intervention_comments.feature -
A
features/step_definitions/checklist_steps.rb -
A
features/step_definitions/intervention_comment_steps.rb -
A
features/support/checklist_support.rb -
A
spec/controllers/interventions/quicklists_controller_spec.rb -
A
spec/lib/use_old_fixtures_key_spec.rb -
A
spec/models/probe_graph_spec.rb -
A
vendor/plugins/coveralls/lib/tasks/coveralls_tasks.rake -
R
app/views/interventions/_quicklist.html.erb -
R
app/views/interventions/quicklist_options.html.erb -
R
app/views/interventions/quicklist_options.js.rjs -
R
vendor/plugins/coveralls/tasks/coveralls_tasks.rake -
M
.travis.yml -
M
app/controllers/application_controller.rb -
M
app/controllers/checklists_controller.rb -
M
app/controllers/interventions/probe_assignments_controller.rb -
M
app/controllers/interventions_controller.rb -
M
app/controllers/login_controller.rb -
M
app/controllers/personal_groups_controller.rb -
M
app/controllers/students_controller.rb -
M
app/helpers/interventions_helper.rb -
M
app/helpers/probes_helper.rb -
M
app/helpers/students_helper.rb -
M
app/metal/chart_proxy.rb -
M
app/models/checklist.rb -
M
app/models/district.rb -
M
app/models/intervention.rb -
M
app/models/intervention_cluster.rb -
M
app/models/intervention_definition.rb -
M
app/models/intervention_probe_assignment.rb -
M
app/models/right.rb -
M
app/models/student.rb -
M
app/models/user.rb -
M
app/views/grouped_progress_entries/show.html.erb -
M
app/views/interventions/new.html.erb -
M
app/views/principal_overrides/create.js.rjs -
M
app/views/principal_overrides/destroy.js.rjs -
M
app/views/principal_overrides/undo.js.rjs -
M
app/views/principal_overrides/update.js.rjs -
M
app/views/reports/student_overall.html.erb -
M
app/views/student_comments/_comment.html.erb -
M
app/views/students/_interventions.html.erb -
M
config/environment.rb -
M
config/gems.yml -
M
config/initializers/gchart.rb -
M
config/routes.rb -
M
features/district_admin/district_admin.feature -
M
features/regular_user/sims_demo_walkthrough.feature -
M
features/step_definitions/custom_probe.rb -
M
features/step_definitions/sims_steps.rb -
M
features/support/env.rb -
M
lib/populate_intervention_dropdowns.rb -
M
lib/tasks/cucumber.rake -
M
lib/tasks/moonshine.rake -
M
lib/tasks/rcov.rake -
M
lib/tasks/verify_rcov.rake -
M
lib/use_old_fixtures_key.rb -
M
public/javascripts/application.js -
M
spec/controllers/application_controller_spec.rb -
M
spec/controllers/checklists_controller_spec.rb -
M
spec/controllers/interventions_controller_spec.rb -
M
spec/controllers/personal_groups_controller_spec.rb -
M
spec/controllers/reports_controller_spec.rb -
M
spec/helpers/interventions_helper_spec.rb -
M
spec/helpers/probes_helper_spec.rb -
M
spec/helpers/students_helper_spec.rb -
M
spec/lib/all_controllers_spec.rb -
M
spec/lib/populate_intervention_dropdowns_spec.rb -
M
spec/models/checklist_spec.rb -
M
spec/models/district_spec.rb -
M
spec/models/intervention_probe_assignment_spec.rb -
M
spec/models/intervention_spec.rb -
M
spec/models/probe_definition_benchmark_spec.rb -
M
spec/models/student_spec.rb -
M
vendor/plugins/moonshine/lib/moonshine/manifest/rails/rails.rb