Changeset [05d1c460ae3788e4a6d71be7f4b71bf028d0c1d4] by Shawn Balestracci
February 18th, 2013 @ 08:00 PM
Merge branch 'master' into 620_cico
https://github.com/vegantech/sims/commit/05d1c460ae3788e4a6d71be7f4...
Committed by Shawn Balestracci
- A app/assets/javascripts/coffee-disabled/uploadProgress.js.erb.coffee.diabled
- A app/assets/javascripts/coffee/edit_district.js.coffee
- A app/assets/javascripts/jquery.nested-fields.js
- A app/assets/javascripts/jquery.uploadProgress.js.disabled
- A app/assets/javascripts/jquery_ujs.js
- A config/initializers/notifications.rb
- A features/step_definitions/alternate_entry_steps.rb
- A lib/erb_cov.rb
- A lib/merge_duplicate_students.rb
- R app/assets/javascripts/jquery.uploadProgress.js
- M .travis.yml
- M Gemfile
- M Gemfile.lock
- M app/assets/javascripts/application.js
- M app/assets/javascripts/coffee/uploadProgress.js.erb.coffee
- M app/assets/javascripts/overlib.js
- M app/controllers/districts_controller.rb
- M app/controllers/intervention_builder/goals_controller.rb
- M app/controllers/school_teams_controller.rb
- M app/controllers/students_controller.rb
- M app/controllers/users/sessions_controller.rb
- M app/helpers/flags_helper.rb
- M app/mailers/notifications.rb
- M app/models/checklist.rb
- M app/models/consultation_form.rb
- M app/models/custom_flag.rb
- M app/models/district.rb
- M app/models/district_log.rb
- M app/models/enrollment.rb
- M app/models/goal_definition.rb
- M app/models/ignore_flag.rb
- M app/models/intervention.rb
- M app/models/intervention_cluster.rb
- M app/models/intervention_definition.rb
- M app/models/intervention_participant.rb
- M app/models/objective_definition.rb
- M app/models/probe.rb
- M app/models/probe_definition.rb
- M app/models/recommendation.rb
- M app/models/school.rb
- M app/models/school_team.rb
- M app/models/student.rb
- M app/models/student_comment.rb
- M app/models/system_flag.rb
- M app/models/team_consultation.rb
- M app/models/tier.rb
- M app/models/user.rb
- M app/models/user_school_assignment.rb
- M app/views/assets/_asset.html.erb
- M app/views/districts/bulk_import.html.erb
- M app/views/districts/bulk_import_form.html.erb
- M app/views/districts/edit.html.erb
- M app/views/interventions/_custom.html.erb
- M app/views/interventions/participants/_participant.html.erb
- M app/views/interventions/probe_assignments/_custom_probe_definition.html.erb
- M app/views/layouts/application.html.erb
- M app/views/login/_whats_new.html.erb
- M app/views/main/index.html.erb
- M app/views/reports/_select_format.html.erb
- M app/views/reports/student_overall_options.html.erb
- M app/views/reports/team_notes.html.erb
- M app/views/reports/user_interventions.html.erb
- M app/views/students/index.html.erb
- M app/views/team_consultations/_commands.html.erb
- M app/views/team_consultations/complete.js.erb
- M app/views/team_consultations/create.js.erb
- M app/views/team_consultations/destroy.js.erb
- M app/views/team_consultations/undo_complete.js.erb
- M config/deploy/production.rb
- M config/environments/cucumber.rb
- M config/environments/development_with_cache.rb
- M config/moonshine.yml
- M config/routes.rb
- M db/schema.rb
- M features/district_admin/bulk_import.feature
- M features/regular_user/alternate_entry_points.feature
- M features/step_definitions/file_import.rb
- M lib/prime_cache.rb
- M lib/usage_by_district.rb
- M spec/controllers/application_controller_spec.rb
- M spec/controllers/students_controller_spec.rb
- M spec/factories.rb
- M spec/helpers/application_helper_spec.rb
- M spec/helpers/links_and_attachments_spec.rb
- M spec/models/enrollment_spec.rb
- M spec/spec_helper.rb
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