Changeset [336f6576e48f50c9d960c9556e230bb9bd8d56ce] by Shawn Balestracci
Revision 336f6576e48f50c9d960c9556e230bb9bd8d56ce,
committed by Shawn Balestracci
· June 21st, 2012 @ 07:04 PM
Merge branch 'devise' into wip
https://github.com/vegantech/sims/commit/336f6576e48f50c9d960c9556e...
26 changed files
-
M
app/helpers/application_helper.rb -
M
app/helpers/flags_helper.rb -
M
app/helpers/move_up_down_buttons_helper.rb -
M
app/views/consultation_forms/_consultation_form_summary.html.erb -
M
app/views/custom_flags/_flag.html.erb -
M
app/views/custom_flags/_list.html.erb -
M
app/views/groups/students/_add_student_link.html.erb -
M
app/views/groups/students/_student.html.erb -
M
app/views/groups/users/_add_user_assignment_link.html.erb -
M
app/views/groups/users/_user_assignment.html.erb -
M
app/views/interventions/comments/_comment.html.erb -
M
app/views/interventions/probe_assignments/_intervention_probe_assignment_detail.html.erb -
M
app/views/interventions/probes/_probe.html.erb -
M
app/views/principal_overrides/_override.html.erb -
M
app/views/special_user_groups/_add_special_user_group_link.html.erb -
M
app/views/special_user_groups/_special_user_group_assignment.html.erb -
M
app/views/student_comments/_comment.html.erb -
M
app/views/students/_add_note_link.html.erb -
M
app/views/students/_interventions.html.erb -
M
app/views/students/_recommendations.html.erb -
M
app/views/team_consultations/_commands.html.erb -
M
app/views/team_consultations/_draft.html.erb -
M
app/views/team_consultations/_team_consultation.html.erb -
M
app/views/unattached_interventions/_participant.html.erb -
M
spec/helpers/application_helper_spec.rb -
M
spec/helpers/flags_helper_spec.rb