Changeset [57dc5f0ef3d6d19280a8cf92b0eecfee1d44020b] by Shawn Balestracci
Revision 57dc5f0ef3d6d19280a8cf92b0eecfee1d44020b,
committed by Shawn Balestracci
· March 8th, 2010 @ 09:10 PM
Merge branch 'master' into 271_group_progress_monitor_entry
http://github.com/vegantech/sims/commit/57dc5f0ef3d6d19280a8cf92b0e...
16 changed files
-
A
db/migrate/20100309003823_add_custom_field_to_probe_definitions.rb -
M
app/controllers/intervention_builder/probes_controller.rb -
M
app/controllers/intervention_builder/recommended_monitors_controller.rb -
M
app/helpers/builder_helper.rb -
M
app/models/intervention.rb -
M
app/models/probe_definition.rb -
M
app/models/right.rb -
M
app/views/intervention_builder/objectives/_form.html.erb -
M
app/views/intervention_builder/probes/_form.html.erb -
M
app/views/intervention_builder/probes/index.html.erb -
M
app/views/intervention_builder/recommended_monitors/assign_interventions_to_probe.html.erb -
M
app/views/intervention_builder/recommended_monitors/assign_probes_to_intervention.html.erb -
M
config/deploy/staging.rb -
M
config/environment.rb -
M
db/schema.rb -
M
features/content_admin/probe_builder.feature