Changeset [1f8540c6386a9cc836da547f78d284e5d0ce3213] by Shawn Balestracci
Revision 1f8540c6386a9cc836da547f78d284e5d0ce3213,
committed by Shawn Balestracci
· January 9th, 2012 @ 09:07 PM
Merge branch 'master' into checklist_refactoring
https://github.com/vegantech/sims/commit/1f8540c6386a9cc836da547f78...
164 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/intervention_comments.feature -
A
features/step_definitions/custom_email_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/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 -
R
vendor/plugins/email-spec/History.txt -
R
vendor/plugins/email-spec/MIT-LICENSE.txt -
R
vendor/plugins/email-spec/README.rdoc -
R
vendor/plugins/email-spec/Rakefile -
R
vendor/plugins/email-spec/VERSION.yml -
R
vendor/plugins/email-spec/email_spec.gemspec -
R
vendor/plugins/email-spec/examples/rails_root/Rakefile -
R
vendor/plugins/email-spec/examples/rails_root/app/controllers/application.rb -
R
vendor/plugins/email-spec/examples/rails_root/app/controllers/welcome_controller.rb -
R
vendor/plugins/email-spec/examples/rails_root/app/helpers/application_helper.rb -
R
vendor/plugins/email-spec/examples/rails_root/app/helpers/welcome_helper.rb -
R
vendor/plugins/email-spec/examples/rails_root/app/models/user.rb -
R
vendor/plugins/email-spec/examples/rails_root/app/models/user_mailer.rb -
R
vendor/plugins/email-spec/examples/rails_root/app/views/user_mailer/signup.erb -
R
vendor/plugins/email-spec/examples/rails_root/app/views/welcome/confirm.html.erb -
R
vendor/plugins/email-spec/examples/rails_root/app/views/welcome/index.html.erb -
R
vendor/plugins/email-spec/examples/rails_root/app/views/welcome/signup.html.erb -
R
vendor/plugins/email-spec/examples/rails_root/config/boot.rb -
R
vendor/plugins/email-spec/examples/rails_root/config/database.yml -
R
vendor/plugins/email-spec/examples/rails_root/config/environment.rb -
R
vendor/plugins/email-spec/examples/rails_root/config/environments/development.rb -
R
vendor/plugins/email-spec/examples/rails_root/config/environments/production.rb -
R
vendor/plugins/email-spec/examples/rails_root/config/environments/test.rb -
R
vendor/plugins/email-spec/examples/rails_root/config/initializers/inflections.rb -
R
vendor/plugins/email-spec/examples/rails_root/config/initializers/mime_types.rb -
R
vendor/plugins/email-spec/examples/rails_root/config/initializers/new_rails_defaults.rb -
R
vendor/plugins/email-spec/examples/rails_root/config/routes.rb -
R
vendor/plugins/email-spec/examples/rails_root/cucumber.yml -
R
vendor/plugins/email-spec/examples/rails_root/db/migrate/20090125013728_create_users.rb -
R
vendor/plugins/email-spec/examples/rails_root/db/schema.rb -
R
vendor/plugins/email-spec/examples/rails_root/doc/README_FOR_APP -
R
vendor/plugins/email-spec/examples/rails_root/features/errors.feature -
R
vendor/plugins/email-spec/examples/rails_root/features/example.feature -
R
vendor/plugins/email-spec/examples/rails_root/features/step_definitions/email_steps.rb -
R
vendor/plugins/email-spec/examples/rails_root/features/step_definitions/user_steps.rb -
R
vendor/plugins/email-spec/examples/rails_root/features/step_definitions/webrat_steps.rb -
R
vendor/plugins/email-spec/examples/rails_root/features/support/env.rb -
R
vendor/plugins/email-spec/examples/rails_root/public/404.html -
R
vendor/plugins/email-spec/examples/rails_root/public/422.html -
R
vendor/plugins/email-spec/examples/rails_root/public/500.html -
R
vendor/plugins/email-spec/examples/rails_root/public/dispatch.rb -
R
vendor/plugins/email-spec/examples/rails_root/public/favicon.ico -
R
vendor/plugins/email-spec/examples/rails_root/public/images/rails.png -
R
vendor/plugins/email-spec/examples/rails_root/public/javascripts/application.js -
R
vendor/plugins/email-spec/examples/rails_root/public/javascripts/controls.js -
R
vendor/plugins/email-spec/examples/rails_root/public/javascripts/dragdrop.js -
R
vendor/plugins/email-spec/examples/rails_root/public/javascripts/effects.js -
R
vendor/plugins/email-spec/examples/rails_root/public/javascripts/prototype.js -
R
vendor/plugins/email-spec/examples/rails_root/public/robots.txt -
R
vendor/plugins/email-spec/examples/rails_root/script/about -
R
vendor/plugins/email-spec/examples/rails_root/script/autospec -
R
vendor/plugins/email-spec/examples/rails_root/script/console -
R
vendor/plugins/email-spec/examples/rails_root/script/cucumber -
R
vendor/plugins/email-spec/examples/rails_root/script/dbconsole -
R
vendor/plugins/email-spec/examples/rails_root/script/destroy -
R
vendor/plugins/email-spec/examples/rails_root/script/generate -
R
vendor/plugins/email-spec/examples/rails_root/script/performance/benchmarker -
R
vendor/plugins/email-spec/examples/rails_root/script/performance/profiler -
R
vendor/plugins/email-spec/examples/rails_root/script/performance/request -
R
vendor/plugins/email-spec/examples/rails_root/script/plugin -
R
vendor/plugins/email-spec/examples/rails_root/script/process/inspector -
R
vendor/plugins/email-spec/examples/rails_root/script/process/reaper -
R
vendor/plugins/email-spec/examples/rails_root/script/process/spawner -
R
vendor/plugins/email-spec/examples/rails_root/script/runner -
R
vendor/plugins/email-spec/examples/rails_root/script/server -
R
vendor/plugins/email-spec/examples/rails_root/script/spec -
R
vendor/plugins/email-spec/examples/rails_root/script/spec_server -
R
vendor/plugins/email-spec/examples/rails_root/spec/controllers/welcome_controller_spec.rb -
R
vendor/plugins/email-spec/examples/rails_root/spec/model_factory.rb -
R
vendor/plugins/email-spec/examples/rails_root/spec/models/user_mailer_spec.rb -
R
vendor/plugins/email-spec/examples/rails_root/spec/models/user_spec.rb -
R
vendor/plugins/email-spec/examples/rails_root/spec/rcov.opts -
R
vendor/plugins/email-spec/examples/rails_root/spec/spec.opts -
R
vendor/plugins/email-spec/examples/rails_root/spec/spec_helper.rb -
R
vendor/plugins/email-spec/examples/rails_root/stories/all.rb -
R
vendor/plugins/email-spec/examples/rails_root/stories/helper.rb -
R
vendor/plugins/email-spec/examples/rails_root/vendor/plugins/email_spec/rails_generators/email_spec/email_spec_generator.rb -
R
vendor/plugins/email-spec/examples/rails_root/vendor/plugins/email_spec/rails_generators/email_spec/templates/email_steps.rb -
R
vendor/plugins/email-spec/features/rails_app.feature -
R
vendor/plugins/email-spec/features/rails_app_steps.rb -
R
vendor/plugins/email-spec/features/support/env.rb -
R
vendor/plugins/email-spec/install.rb -
R
vendor/plugins/email-spec/lib/email_spec.rb -
R
vendor/plugins/email-spec/lib/email_spec/address_converter.rb -
R
vendor/plugins/email-spec/lib/email_spec/cucumber.rb -
R
vendor/plugins/email-spec/lib/email_spec/deliveries.rb -
R
vendor/plugins/email-spec/lib/email_spec/email_viewer.rb -
R
vendor/plugins/email-spec/lib/email_spec/helpers.rb -
R
vendor/plugins/email-spec/lib/email_spec/matchers.rb -
R
vendor/plugins/email-spec/rails_generators/email_spec/email_spec_generator.rb -
R
vendor/plugins/email-spec/rails_generators/email_spec/templates/email_steps.rb -
R
vendor/plugins/email-spec/spec/email_spec/matchers_spec.rb -
R
vendor/plugins/email-spec/spec/spec.opts -
R
vendor/plugins/email-spec/spec/spec_helper.rb -
M
app/controllers/application_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/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/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/environments/cucumber.rb -
M
config/initializers/gchart.rb -
M
config/routes.rb -
M
features/district_admin/scripted.feature -
M
features/regular_user/checklist.feature -
M
features/regular_user/principal_override_acceptance.feature -
M
features/step_definitions/checklist_steps.rb -
M
features/step_definitions/email_steps.rb -
M
features/step_definitions/subscenarios.rb -
M
features/support/env.rb -
M
lib/populate_intervention_dropdowns.rb -
M
lib/tasks/cucumber.rake -
M
lib/tasks/rcov.rake -
M
lib/tasks/verify_rcov.rake -
M
public/javascripts/application.js -
M
spec/controllers/application_controller_spec.rb -
M
spec/controllers/interventions_controller_spec.rb -
M
spec/controllers/personal_groups_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/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