Changeset [ff08a4ab7c2167d46aa5c735c9245f849ca53ee8] by Shawn Balestracci

June 16th, 2009 @ 09:45 AM

Merge branch 'master' of git@github.com:vegantech/sims http://github.com/vegantech/sims...

Committed by Shawn Balestracci

  • M app/cells/administration/district.html.erb
  • M app/controllers/checklist_builder/elements_controller.rb
  • M app/controllers/checklist_builder/questions_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/districts_controller.rb
  • M app/helpers/application_helper.rb
  • M app/helpers/builder_helper.rb
  • M app/models/consultation_form_concern.rb
  • M app/models/district.rb
  • M app/models/enrollment.rb
  • M app/models/probe_bar.rb
  • M app/models/role.rb
  • M app/models/school.rb
  • M app/models/student.rb
  • M app/models/system.rb
  • M app/models/system_flag.rb
  • M app/models/user.rb
  • M app/views/consultation_forms/_concerns_form.html.erb
  • M app/views/consultation_forms/_consultation_form.html.erb
  • M app/views/district/schools/_form.html.erb
  • M app/views/district/schools/_user_school_assignment.html.erb
  • M app/views/district/schools/edit.html.erb
  • M app/views/district/schools/index.html.erb
  • M app/views/district/schools/new.html.erb
  • M app/views/district/schools/show.html.erb
  • M app/views/district/students/_enrollment.html.erb
  • M app/views/district/students/_form.html.erb
  • 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/students/show.html.erb
  • M app/views/district/users/_district_groups.html.erb
  • M app/views/district/users/_form.html.erb
  • M app/views/district/users/_role.html.erb
  • M app/views/district/users/_roles.html.erb
  • M app/views/district/users/_user_school_assignment.html.erb
  • M app/views/district/users/index.html.erb
  • M app/views/districts/_form.html.erb
  • M app/views/districts/bulk_import_form.html.erb
  • M app/views/districts/edit.html.erb
  • M app/views/districts/new.html.erb
  • M app/views/help/_roles.html.erb
  • M app/views/layouts/application.html.erb
  • M app/views/students/_extended_profile.html.erb
  • M app/views/students/_student.html.erb
  • M app/views/students/_team_consultations.html.erb
  • M app/views/students/show.html.erb
  • M config/routes.rb
  • M db/migrate/20090603021222_add_district_key_next_key_and_user_salt.rb
  • M db/migrate/20090608144341_remove_checked_from_consultation_form_concerns.rb
  • M db/migrate/20090608185201_add_id_district_to_users.rb
  • M db/migrate/20090614175117_rename_district_next_key_to_previous_key.rb
  • M db/schema.rb
  • M doc/api_doc
  • M doc/csv_import.txt
  • M doc/deletetion_strategy
  • M doc/import_schools.rb
  • M features/bulk_import.feature
  • M features/district_students_admin.feature
  • M features/district_users_admin.feature
  • M features/enrollment_import.feature
  • M features/step_definitions/file_import.rb
  • M features/step_definitions/sims_steps.rb
  • M features/student_import.feature
  • M features/support/files/users.csv
  • M features/user_import.feature
  • M lib/import_csv.rb
  • M lib/tasks/verify_rcov.rake
  • M spec/controllers/checklist_builder/questions_controller_spec.rb
  • 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/districts_controller_spec.rb
  • M spec/fixtures/users.yml
  • M spec/helpers/builder_helper_spec.rb
  • M spec/lib/import_csv_spec.rb
  • M spec/models/consultation_form_concern_spec.rb
  • M spec/models/district_spec.rb
  • M spec/models/user_spec.rb
  • M spec/reports/flags_for_student_report_spec.rb
  • M spec/routing/district/students_routing_spec.rb
  • M test/csv/enrollments/telophia/enrollments.csv
  • M test/csv/students/empty/students.csv
  • M test/csv/students/single/students.csv
  • M test/csv/users/empty/users.csv
  • M test/csv/users/invalid_format/users.csv
  • M test/csv/users/single/users.csv
  • M test/csv/users/two/users.csv
  • M test/fixtures/rights.yml
  • M test/fixtures/roles.yml
  • M test/fixtures/users.yml
  • M vendor/gems/webrat-0.4.4/lib/webrat/core/save_and_open_page.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

Student Intervention Monitoring System

Shared Ticket Bins