Changeset [fb40c0c886422c847716349675e59edcf1b75313] by Shawn Balestracci
Revision fb40c0c886422c847716349675e59edcf1b75313,
committed by Shawn Balestracci
· January 26th, 2013 @ 12:29 PM
Merge branch 'jquery' into rails3.2_ruby_1.9.3
Conflicts:
spec/models/user_group_assignment_spec.rb
https://github.com/vegantech/sims/commit/fb40c0c886422c847716349675...
24 changed files
-
A
app/views/team_referrals/concern_note_response.text.erb -
A
windows_live.yml -
M
app/controllers/application_controller.rb -
M
app/helpers/application_helper.rb -
M
app/helpers/flags_helper.rb -
M
app/mailers/team_referrals.rb -
M
app/models/consultation_form.rb -
M
app/models/district.rb -
M
app/models/principal_override_observer.rb -
M
app/models/team_consultation.rb -
M
app/views/districts/edit.html.erb -
M
app/views/login/_whats_new.html.erb -
M
app/views/students/_team_consultations.html.erb -
M
app/views/team_consultations/_new.html.erb -
M
app/views/users/sessions/new.html.erb -
M
config/initializers/host_info.rb -
M
features/regular_user/concern_note.feature -
M
features/step_definitions/concerns_steps.rb -
M
features/step_definitions/interventions_steps.rb -
M
features/support/paths.rb -
M
spec/helpers/application_helper_spec.rb -
M
spec/helpers/flags_helper_spec.rb -
M
spec/models/team_consultation_spec.rb -
M
spec/models/user_group_assignment_spec.rb