Changeset [c77198d44e287fc847e594d77e4370c21782c337] by Shawn Balestracci
December 12th, 2011 @ 08:15 AM
Merge branch 'master' into
595_default_to_assign_yourself_intervention_and_help
https://github.com/vegantech/sims/commit/c77198d44e287fc847e594d77e...
Committed by Shawn Balestracci
- A app/views/district/users/_staff_assignment.erb
- A app/views/district/users/_staff_assignments.erb
- A app/views/layouts/_district_docs.html.erb
- A app/views/team_consultations/undo_complete.js.rjs
- A config/initializers/airbrake.rb
- A lib/tasks/airbrake_tasks.rake
- A public/district_upload/sample/ext_test_scores_append.csv
- A spec/csv/ext_test_scores.csv
- A spec/csv/ext_test_scores_appends.csv
- A spec/lib/csv_importer/base_spec.rb
- A spec/lib/csv_importer/ext_test_scores_spec.rb
- A vendor/gems/airbrake-3.0.5/.gitignore
- A vendor/gems/airbrake-3.0.5/.specification
- A vendor/gems/airbrake-3.0.5/.yardopts
- A vendor/gems/airbrake-3.0.5/CHANGELOG
- A vendor/gems/airbrake-3.0.5/Gemfile
- A vendor/gems/airbrake-3.0.5/INSTALL
- A vendor/gems/airbrake-3.0.5/MIT-LICENSE
- A vendor/gems/airbrake-3.0.5/README.md
- A vendor/gems/airbrake-3.0.5/README_FOR_HEROKU_ADDON.md
- A vendor/gems/airbrake-3.0.5/Rakefile
- A vendor/gems/airbrake-3.0.5/SUPPORTED_RAILS_VERSIONS
- A vendor/gems/airbrake-3.0.5/TESTING.md
- A vendor/gems/airbrake-3.0.5/airbrake.gemspec
- A vendor/gems/airbrake-3.0.5/features/metal.feature
- A vendor/gems/airbrake-3.0.5/features/rack.feature
- A vendor/gems/airbrake-3.0.5/features/rails.feature
- A vendor/gems/airbrake-3.0.5/features/rails_with_js_notifier.feature
- A vendor/gems/airbrake-3.0.5/features/rake.feature
- A vendor/gems/airbrake-3.0.5/features/sinatra.feature
- A vendor/gems/airbrake-3.0.5/features/step_definitions/airbrake_shim.rb.template
- A vendor/gems/airbrake-3.0.5/features/step_definitions/file_steps.rb
- A vendor/gems/airbrake-3.0.5/features/step_definitions/metal_steps.rb
- A vendor/gems/airbrake-3.0.5/features/step_definitions/rack_steps.rb
- A vendor/gems/airbrake-3.0.5/features/step_definitions/rails_application_steps.rb
- A vendor/gems/airbrake-3.0.5/features/step_definitions/rake_steps.rb
- A vendor/gems/airbrake-3.0.5/features/support/airbrake_shim.rb.template
- A vendor/gems/airbrake-3.0.5/features/support/env.rb
- A vendor/gems/airbrake-3.0.5/features/support/matchers.rb
- A vendor/gems/airbrake-3.0.5/features/support/rails.rb
- A vendor/gems/airbrake-3.0.5/features/support/rake/Rakefile
- A vendor/gems/airbrake-3.0.5/features/support/terminal.rb
- A vendor/gems/airbrake-3.0.5/features/user_informer.feature
- A vendor/gems/airbrake-3.0.5/generators/airbrake/airbrake_generator.rb
- A vendor/gems/airbrake-3.0.5/generators/airbrake/lib/insert_commands.rb
- A vendor/gems/airbrake-3.0.5/generators/airbrake/lib/rake_commands.rb
- A vendor/gems/airbrake-3.0.5/generators/airbrake/templates/airbrake_tasks.rake
- A vendor/gems/airbrake-3.0.5/generators/airbrake/templates/capistrano_hook.rb
- A vendor/gems/airbrake-3.0.5/generators/airbrake/templates/initializer.rb
- A vendor/gems/airbrake-3.0.5/install.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/backtrace.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/capistrano.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/configuration.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/notice.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/rack.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/rails.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/rails/action_controller_catcher.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/rails/controller_methods.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/rails/error_lookup.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/rails/javascript_notifier.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/rails3_tasks.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/railtie.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/rake_handler.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/sender.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/shared_tasks.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/tasks.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/user_informer.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake/version.rb
- A vendor/gems/airbrake-3.0.5/lib/airbrake_tasks.rb
- A vendor/gems/airbrake-3.0.5/lib/rails/generators/airbrake/airbrake_generator.rb
- A vendor/gems/airbrake-3.0.5/lib/templates/javascript_notifier.erb
- A vendor/gems/airbrake-3.0.5/lib/templates/rescue.erb
- A vendor/gems/airbrake-3.0.5/rails/init.rb
- A vendor/gems/airbrake-3.0.5/resources/README.md
- A vendor/gems/airbrake-3.0.5/resources/ca-bundle.crt
- A vendor/gems/airbrake-3.0.5/script/integration_test.rb
- A vendor/gems/airbrake-3.0.5/test/airbrake_2_2.xsd
- A vendor/gems/airbrake-3.0.5/test/airbrake_tasks_test.rb
- A vendor/gems/airbrake-3.0.5/test/backtrace_test.rb
- A vendor/gems/airbrake-3.0.5/test/capistrano_test.rb
- A vendor/gems/airbrake-3.0.5/test/catcher_test.rb
- A vendor/gems/airbrake-3.0.5/test/configuration_test.rb
- A vendor/gems/airbrake-3.0.5/test/helper.rb
- A vendor/gems/airbrake-3.0.5/test/javascript_notifier_test.rb
- A vendor/gems/airbrake-3.0.5/test/logger_test.rb
- A vendor/gems/airbrake-3.0.5/test/notice_test.rb
- A vendor/gems/airbrake-3.0.5/test/notifier_test.rb
- A vendor/gems/airbrake-3.0.5/test/rack_test.rb
- A vendor/gems/airbrake-3.0.5/test/rails_initializer_test.rb
- A vendor/gems/airbrake-3.0.5/test/recursion_test.rb
- A vendor/gems/airbrake-3.0.5/test/sender_test.rb
- A vendor/gems/airbrake-3.0.5/test/user_informer_test.rb
- R config/initializers/hoptoad.rb
- R vendor/gems/hoptoad_notifier-2.4.2/generators/hoptoad/templates/hoptoad_notifier_tasks.rake
- R vendor/gems/hoptoad_notifier-2.4.2/CHANGELOG
- R vendor/gems/hoptoad_notifier-2.4.2/MIT-LICENSE
- R vendor/gems/hoptoad_notifier-2.4.2/README_FOR_HEROKU_ADDON.md
- R vendor/gems/hoptoad_notifier-2.4.2/Rakefile
- R vendor/gems/hoptoad_notifier-2.4.2/generators/hoptoad/hoptoad_generator.rb
- R vendor/gems/hoptoad_notifier-2.4.2/generators/hoptoad/lib/insert_commands.rb
- R vendor/gems/hoptoad_notifier-2.4.2/generators/hoptoad/lib/rake_commands.rb
- R lib/tasks/hoptoad_notifier_tasks.rake
- R vendor/gems/hoptoad_notifier-2.4.2/generators/hoptoad/templates/initializer.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/backtrace.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/configuration.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/notice.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/rack.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/rails/action_controller_catcher.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/rails/controller_methods.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/rails/error_lookup.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/rails3_tasks.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/sender.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/shared_tasks.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/tasks.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/rails/generators/hoptoad/hoptoad_generator.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/templates/rescue.erb
- R vendor/gems/hoptoad_notifier-2.4.2/script/integration_test.rb
- R vendor/gems/hoptoad_notifier-2.4.2/test/backtrace_test.rb
- R vendor/gems/hoptoad_notifier-2.4.2/test/catcher_test.rb
- R vendor/gems/hoptoad_notifier-2.4.2/test/configuration_test.rb
- R vendor/gems/hoptoad_notifier-2.4.2/test/helper.rb
- R vendor/gems/hoptoad_notifier-2.4.2/test/logger_test.rb
- R vendor/gems/hoptoad_notifier-2.4.2/test/notice_test.rb
- R vendor/gems/hoptoad_notifier-2.4.2/test/notifier_test.rb
- R vendor/gems/hoptoad_notifier-2.4.2/test/rack_test.rb
- R vendor/gems/hoptoad_notifier-2.4.2/test/rails_initializer_test.rb
- R vendor/gems/hoptoad_notifier-2.4.2/test/sender_test.rb
- R vendor/gems/hoptoad_notifier-2.4.2/.specification
- R vendor/gems/hoptoad_notifier-2.4.2/INSTALL
- R vendor/gems/hoptoad_notifier-2.4.2/README.rdoc
- R vendor/gems/hoptoad_notifier-2.4.2/SUPPORTED_RAILS_VERSIONS
- R vendor/gems/hoptoad_notifier-2.4.2/TESTING.rdoc
- R vendor/gems/hoptoad_notifier-2.4.2/generators/hoptoad/templates/capistrano_hook.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/capistrano.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/rails.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/rails/javascript_notifier.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/railtie.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_notifier/version.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/hoptoad_tasks.rb
- R vendor/gems/hoptoad_notifier-2.4.2/lib/templates/javascript_notifier.erb
- R vendor/gems/hoptoad_notifier-2.4.2/rails/init.rb
- R vendor/gems/hoptoad_notifier-2.4.2/test/hoptoad_tasks_test.rb
- R vendor/gems/hoptoad_notifier-2.4.2/test/javascript_notifier_test.rb
- 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/districts_controller.rb
- M app/controllers/groups_controller.rb
- M app/controllers/school_teams_controller.rb
- M app/controllers/team_consultations_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/role.rb
- M app/models/special_user_group.rb
- M app/models/staff_assignment.rb
- M app/models/team_consultation.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/bulk_import_form.html.erb
- M app/views/districts/edit.html.erb
- M app/views/doc/_file_summary.html.erb
- M app/views/doc/district_upload.html.erb
- M app/views/doc/district_upload/file_api.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 app/views/team_consultations/_team_consultation.html.erb
- M app/views/team_consultations/complete.js.rjs
- M config/deploy.rb
- M config/environment.rb
- M config/routes.rb
- M doc/oneoffscripts.txt
- M doc/stats.rb
- M features/district_admin/district_users_admin.feature
- M features/step_definitions/district_builder_steps.rb
- M lib/csv_importer/base.rb
- M lib/csv_importer/ext_test_scores.rb
- M lib/csv_importer/students.rb
- M lib/import_csv.rb
- M public/500.html
- M public/district_upload/sample/sample.zip
- M public/district_upload_api.html
- M public/stylesheets/common.css
- M public/tutorial/district_admin.html
- 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/controllers/team_consultations_controller_spec.rb
- M spec/lib/csv_importer/students_spec.rb
- M spec/lib/import_csv_spec.rb
- M spec/models/special_user_group_spec.rb
- M spec/models/team_consultation_spec.rb
- M spec/models/user_spec.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