Changeset [a67b1adab830cb8255c487f2b41a7ee061af9842] by Shawn Balestracci
Revision a67b1adab830cb8255c487f2b41a7ee061af9842,
committed by Shawn Balestracci
· November 10th, 2010 @ 05:45 PM
Merge branch 'master' into 364_orphaned_interventions
https://github.com/vegantech/sims/commit/a67b1adab830cb8255c487f2b4...
27 changed files
-
A
app/views/layouts/email.erb -
A
doc/sis_export/ic_sims/all_students_in_district.sql -
A
doc/sis_export/ic_sims/all_students_in_school.sql -
A
doc/sis_export/ic_sims/content_admins.sql -
A
doc/sis_export/ic_sims/csvdump.bat -
A
doc/sis_export/ic_sims/district_admins.sql -
A
doc/sis_export/ic_sims/enrollment_output.sql -
A
doc/sis_export/ic_sims/news_admins.sql -
A
doc/sis_export/ic_sims/regular_users.sql -
A
doc/sis_export/ic_sims/school_output.sql -
A
doc/sis_export/ic_sims/student_output.sql -
A
doc/sis_export/ic_sims/user_output.sql -
M
app/controllers/doc_controller.rb -
M
app/manifests/templates/passenger.vhost.erb -
M
app/models/notifications.rb -
M
app/models/student.rb -
M
app/models/team_referrals.rb -
M
lib/csv_importer/students.rb -
M
public/stylesheets/print.css -
M
public/stylesheets/screen.css -
M
spec/lib/csv_importer/students_spec.rb -
M
spec/models/team_referrals_spec.rb -
M
vendor/gems/acts_as_reportable-1.1.1/.specification -
M
vendor/gems/responds_to_parent-1.0.20091013/.specification -
M
vendor/gems/ruport-1.6.1/.specification -
M
vendor/gems/term-ansicolor-1.0.3/.specification -
M
vendor/gems/thoughtbot-factory_girl-1.2.1/.specification