Changeset [196aab5626ae06b294298d1256f9c7a6c013d4ce] by Shawn Balestracci
Revision 196aab5626ae06b294298d1256f9c7a6c013d4ce,
committed by Shawn Balestracci
· January 27th, 2013 @ 01:32 PM
Merge branch 'master' into saucelabs
Conflicts:
Gemfile.lock
https://github.com/vegantech/sims/commit/196aab5626ae06b294298d1256...
35 changed files
-
A
db/migrate/20130126060537_remove_probe_questions.rb -
R
app/models/probe_question.rb -
R
app/views/interventions/probes/_coding_help.html.erb -
R
app/views/interventions/probes/_question.html.erb -
R
app/views/interventions/probes/_results_table.html.erb -
R
app/views/interventions/probes/_scoring_help.html.erb -
R
app/views/interventions/probes/new_assessment.html.erb -
R
app/views/interventions/probes/print_results.html.erb -
R
spec/fixtures/probe_questions.yml -
R
spec/models/probe_question_spec.rb -
R
test/fixtures/probe_questions.yml -
M
.travis.yml -
M
Gemfile -
M
Gemfile.lock -
M
app/assets/javascripts/application.js -
M
app/controllers/interventions/probes_controller.rb -
M
app/helpers/probes_helper.rb -
M
app/models/district.rb -
M
app/models/probe.rb -
M
app/models/probe_definition.rb -
M
app/views/interventions/probe_assignments/_probe_assignment.html.erb -
M
app/views/interventions/probes/_form.html.erb -
M
config/deploy/veg_open.rb -
M
config/environments/development.rb -
M
config/environments/development_with_cache.rb -
M
config/environments/test.rb -
M
config/initializers/host_info.rb -
M
config/initializers/mime_types.rb -
M
config/initializers/mysql_set_setup.rb -
M
config/routes.rb -
M
db/schema.rb -
M
features/regular_user/forgot_password.feature -
M
spec/fixtures/probes.yml -
M
spec/models/probe_spec.rb -
M
spec/models/user_group_assignment_spec.rb