Changeset [ce290b4df8c50238f403bf9ef51ea8a7fc9b6c3f] by Shawn Balestracci

Revision ce290b4df8c50238f403bf9ef51ea8a7fc9b6c3f, committed by Shawn Balestracci · November 28th, 2011 @ 06:50 PM

Merge branch 'master' into 604_team_consultation_attachments
https://github.com/vegantech/sims/commit/ce290b4df8c50238f403bf9ef5...

40 changed files

A app/views/district/users/_staff_assignment.erb
A app/views/district/users/_staff_assignments.erb
A app/views/layouts/_district_docs.html.erb
M app/controllers/application_controller.rb
M app/controllers/district/schools_controller.rb
M app/controllers/district/students_controller.rb
M app/controllers/district/users_controller.rb
M app/controllers/groups_controller.rb
M app/controllers/school_teams_controller.rb
M app/helpers/builder_helper.rb
M app/helpers/label_form_builder.rb
M app/models/district.rb
M app/models/group.rb
M app/models/staff_assignment.rb
M app/models/user.rb
M app/views/consultation_forms/edit.js.rjs
M app/views/district/students/edit.html.erb
M app/views/district/students/index.html.erb
M app/views/district/students/new.html.erb
M app/views/district/users/_label_form.html.erb
M app/views/district/users/edit.html.erb
M app/views/district/users/index.html.erb
M app/views/district/users/new.html.erb
M app/views/districts/edit.html.erb
M app/views/groups/edit.html.erb
M app/views/groups/index.html.erb
M app/views/groups/new.html.erb
M app/views/groups/show.html.erb
M app/views/groups/show_special.html.erb
M app/views/layouts/_menu.html.erb
M app/views/login/_whats_new.html.erb
M features/district_admin/district_users_admin.feature
M features/step_definitions/district_builder_steps.rb
M public/stylesheets/common.css
M spec/controllers/district/schools_controller_spec.rb
M spec/controllers/district/students_controller_spec.rb
M spec/controllers/district/users_controller_spec.rb
M spec/controllers/groups_controller_spec.rb
M spec/controllers/school_teams_controller_spec.rb
M spec/models/user_spec.rb