Changeset [368f76b6762f87758f6f2237ddcb81d3eccce8cb] by Shawn Balestracci
June 21st, 2012 @ 06:50 PM
Merge branch 'master' into remove_prototype_legacy_helper
Conflicts:
app/helpers/application_helper.rb
app/views/interventions/comments/_comment.html.erb
spec/helpers/application_helper_spec.rb
https://github.com/vegantech/sims/commit/368f76b6762f87758f6f2237dd...
Committed by Shawn Balestracci
- A app/controllers/school_admin_controller.rb
- A app/controllers/stats_controller.rb
- A app/controllers/student_searches_controller.rb
- A app/models/student_search.rb
- A app/views/interventions/comments/_edit_js.html.erb
- A app/views/layouts/_dev_debug.html.erb
- A app/views/stats/index.html.erb
- A app/views/student_searches/grade.js.rjs
- A app/views/student_searches/member.js.rjs
- A app/views/student_searches/show.html.erb
- A db/migrate/20120510140653_add_forgot_password_to_districts.rb
- A db/migrate/20120524222856_add_all_studentsand_all_schools_to_users.rb
- A db/migrate/20120524223251_move_all_schools_and_all_students_to_users.rb
- A db/migrate/20120524225140_remove_district_id_and_grouptype_from_special_user_groups.rb
- A db/migrate/20120529233808_add_status_to_district_logs.rb
- A features/regular_user/forgot_password.feature
- A features/regular_user/stats.feature
- A features/regular_user/student_flag_summary_report.feature
- A lib/csv_importer/admins_of_schools.rb
- A public/district_upload/empty/admins_of_schools.csv
- A public/district_upload/sample/admins_of_schools.csv
- A spec/controllers/school_admin_controller_spec.rb
- A spec/controllers/stats_controller_spec.rb
- A spec/controllers/student_searches_controller_spec.rb
- A spec/csv/admins_of_schools.csv
- A spec/lib/csv_importer/admins_of_schools_spec.rb
- R app/views/layouts/application.html.erb.rails2
- R app/views/login/_country_state_district.html.erb
- R app/views/main/stats.html.erb
- R app/views/students/grade_search.js.rjs
- R app/views/students/member_search.js.rjs
- R app/views/students/search.html.erb
- R config/deploy/veg-open.rb
- R lib/country_state_district.rb
- R spec/lib/country_state_district_spec.rb
- R vendor/plugins_broken_in_rails_3/acts_as_list/README
- R vendor/plugins_broken_in_rails_3/acts_as_list/init.rb
- R vendor/plugins_broken_in_rails_3/acts_as_list/lib/active_record/acts/list.rb
- R vendor/plugins_broken_in_rails_3/acts_as_list/test/list_test.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/MIT-LICENSE
- R vendor/plugins_broken_in_rails_3/html_matchers/README
- R vendor/plugins_broken_in_rails_3/html_matchers/Rakefile
- R vendor/plugins_broken_in_rails_3/html_matchers/init.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/install.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/lib/.gitignore
- R vendor/plugins_broken_in_rails_3/html_matchers/lib/html_matchers.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/lib/matchers/.gitignore
- R vendor/plugins_broken_in_rails_3/html_matchers/lib/matchers/button_matcher.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/lib/matchers/check_box_group_matcher.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/lib/matchers/drop_down_matcher.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/lib/matchers/image_matcher.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/lib/matchers/options_matcher.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/lib/matchers/radio_group_matcher.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/lib/matchers/span_text_matcher.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/lib/matchers/table_body_matcher.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/lib/matchers/table_header_matcher.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/lib/matchers/table_matcher.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/lib/matchers/td_link_matcher.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/spec/button_matcher_spec.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/spec/check_box_group_matcher_spec.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/spec/drop_down_matcher_spec.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/spec/image_matcher_spec.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/spec/radio_group_matcher_spec.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/spec/span_text_matcher_spec.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/spec/spec.opts
- R vendor/plugins_broken_in_rails_3/html_matchers/spec/spec_helper.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/spec/table_body_matcher_spec.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/spec/table_header_matcher_spec.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/spec/table_matcher_spec.rb
- R vendor/plugins_broken_in_rails_3/html_matchers/tasks/.gitignore
- R vendor/plugins_broken_in_rails_3/html_matchers/uninstall.rb
- R vendor/plugins_broken_in_rails_3/subdomain-fu/CHANGELOG
- R vendor/plugins_broken_in_rails_3/subdomain-fu/MIT-LICENSE
- R vendor/plugins_broken_in_rails_3/subdomain-fu/README.rdoc
- R vendor/plugins_broken_in_rails_3/subdomain-fu/Rakefile
- R vendor/plugins_broken_in_rails_3/subdomain-fu/VERSION.yml
- R vendor/plugins_broken_in_rails_3/subdomain-fu/init.rb
- R vendor/plugins_broken_in_rails_3/subdomain-fu/install.sh
- R vendor/plugins_broken_in_rails_3/subdomain-fu/lib/subdomain-fu.rb
- R vendor/plugins_broken_in_rails_3/subdomain-fu/lib/subdomain_fu/routing_extensions.rb
- R vendor/plugins_broken_in_rails_3/subdomain-fu/lib/subdomain_fu/url_rewriter.rb
- R vendor/plugins_broken_in_rails_3/subdomain-fu/rails/init.rb
- R vendor/plugins_broken_in_rails_3/subdomain-fu/spec/spec.opts
- R vendor/plugins_broken_in_rails_3/subdomain-fu/spec/spec_helper.rb
- R vendor/plugins_broken_in_rails_3/subdomain-fu/spec/subdomain_fu_spec.rb
- R vendor/plugins_broken_in_rails_3/subdomain-fu/spec/url_rewriter_spec.rb
- R vendor/plugins_broken_in_rails_3/subdomain-fu/subdomain-fu.gemspec
- R vendor/plugins_broken_in_rails_3/will_paginate/.gitignore
- R vendor/plugins_broken_in_rails_3/will_paginate/.manifest
- R vendor/plugins_broken_in_rails_3/will_paginate/CHANGELOG.rdoc
- R vendor/plugins_broken_in_rails_3/will_paginate/LICENSE
- R vendor/plugins_broken_in_rails_3/will_paginate/README.rdoc
- R vendor/plugins_broken_in_rails_3/will_paginate/Rakefile
- R vendor/plugins_broken_in_rails_3/will_paginate/examples/apple-circle.gif
- R vendor/plugins_broken_in_rails_3/will_paginate/examples/index.haml
- R vendor/plugins_broken_in_rails_3/will_paginate/examples/index.html
- R vendor/plugins_broken_in_rails_3/will_paginate/examples/pagination.css
- R vendor/plugins_broken_in_rails_3/will_paginate/examples/pagination.sass
- R vendor/plugins_broken_in_rails_3/will_paginate/init.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/array.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/collection.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/core_ext.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/finder.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/named_scope.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/named_scope_patch.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/version.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/view_helpers.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/boot.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/collection_test.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/console
- R vendor/plugins_broken_in_rails_3/will_paginate/test/database.yml
- R vendor/plugins_broken_in_rails_3/will_paginate/test/finder_test.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/admin.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/developer.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/developers_projects.yml
- R vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/project.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/projects.yml
- R vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/replies.yml
- R vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/reply.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/schema.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/topic.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/topics.yml
- R vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/user.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/users.yml
- R vendor/plugins_broken_in_rails_3/will_paginate/test/helper.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/lib/activerecord_test_case.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/lib/activerecord_test_connector.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/lib/load_fixtures.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/lib/view_test_process.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/test/tasks.rake
- R vendor/plugins_broken_in_rails_3/will_paginate/test/view_test.rb
- R vendor/plugins_broken_in_rails_3/will_paginate/will_paginate.gemspec
- M Gemfile
- M Gemfile.lock
- M app/controllers/application_controller.rb
- M app/controllers/districts_controller.rb
- M app/controllers/groups/assignments_controller.rb
- M app/controllers/groups_controller.rb
- M app/controllers/interventions/comments_controller.rb
- M app/controllers/interventions_controller.rb
- M app/controllers/login_controller.rb
- M app/controllers/main_controller.rb
- M app/controllers/quicklist_items_controller.rb
- M app/controllers/school_teams_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/scripted_controller.rb
- M app/controllers/special_user_groups_controller.rb
- M app/controllers/students_controller.rb
- M app/helpers/application_helper.rb
- M app/mailers/notifications.rb
- M app/models/district.rb
- M app/models/district_log.rb
- M app/models/group.rb
- M app/models/intervention.rb
- M app/models/intervention_comment.rb
- M app/models/right.rb
- M app/models/role.rb
- M app/models/special_user_group.rb
- M app/models/student.rb
- M app/models/system.rb
- M app/models/user.rb
- M app/models/user_group_assignment.rb
- M app/models/user_school_assignment.rb
- M app/views/district/schools/_label_form.html.erb
- M app/views/district/users/_district_groups.html.erb
- M app/views/district/users/_label_form.html.erb
- M app/views/districts/edit.html.erb
- M app/views/interventions/_form.html.erb
- M app/views/interventions/comments/_comment.html.erb
- M app/views/interventions/comments/_comments.html.erb
- M app/views/interventions/comments/_form.html.erb
- M app/views/interventions/comments/_index.html.erb
- M app/views/interventions/comments/edit.js.rjs
- M app/views/layouts/_menu.html.erb
- M app/views/layouts/application.html.erb
- M app/views/login/_login.html.erb
- M app/views/login/_whats_new.html.erb
- M app/views/login/change_password.html.erb
- M app/views/reports/student_flag_summary.html.erb
- M app/views/schools/index.html.erb
- M app/views/students/index.html.erb
- M config/routes.rb
- M db/schema.rb
- M doc/oneoffscripts.txt
- M features/district_admin/bulk_import.feature
- M features/district_admin/district_log.feature
- M features/regular_user/alternate_entry_points.feature
- M features/school_admin/groups.feature
- M features/school_admin/quicklist.feature
- M features/step_definitions/custom_probe.rb
- M features/step_definitions/sims_steps.rb
- M features/support/checklist_support.rb
- M features/support/step_helpers.rb
- M lib/create_training_district.rb
- M lib/csv_importer/all_schools.rb
- M lib/csv_importer/all_students_in_districts.rb
- M lib/csv_importer/all_students_in_schools.rb
- M lib/csv_importer/school_admins.rb
- M lib/csv_importer/user_school_assignments.rb
- M lib/import_csv.rb
- M lib/tasks/verify_rcov.rake
- M public/district_upload/empty/empty.zip
- M public/district_upload/sample/sample.zip
- M public/javascripts/application.js
- M spec/controllers/application_controller_spec.rb
- M spec/controllers/interventions_controller_spec.rb
- M spec/controllers/login_controller_spec.rb
- M spec/controllers/main_controller_spec.rb
- M spec/controllers/schools_controller_spec.rb
- M spec/controllers/scripted_controller_spec.rb
- M spec/controllers/students_controller_spec.rb
- M spec/lib/all_controllers_spec.rb
- M spec/lib/csv_importer/all_schools_spec.rb
- M spec/lib/csv_importer/all_students_in_districts_spec.rb
- M spec/lib/csv_importer/all_students_in_schools_spec.rb
- M spec/lib/csv_importer/school_admins_spec.rb
- M spec/lib/csv_importer/user_school_assignments_spec.rb
- M spec/models/district_spec.rb
- M spec/models/enrollment_spec.rb
- M spec/models/intervention_comment_spec.rb
- M spec/models/intervention_spec.rb
- M spec/models/special_user_group_spec.rb
- M spec/models/user_school_assignment_spec.rb
- M spec/models/user_spec.rb
- M test/fixtures/special_user_groups.yml
- M test/fixtures/users.yml
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