Changeset [a99c46291549608836d62d76b69141b2a2ac6391] by Shawn Balestracci

Revision a99c46291549608836d62d76b69141b2a2ac6391, committed by Shawn Balestracci · December 18th, 2012 @ 05:38 PM

Merge branch 'jquery' into jquery_pipeline

Conflicts:
Gemfile.lock app/controllers/student_searches_controller.rb app/controllers/students_controller.rb app/helpers/application_helper.rb app/helpers/checklists_helper.rb app/helpers/flags_helper.rb app/views/layouts/application.html.erb app/views/principal_overrides/_new.html.erb https://github.com/vegantech/sims/commit/a99c46291549608836d62d76b6...

84 changed files

A app/views/custom_flags/create.js.erb
A app/views/custom_flags/destroy.js.erb
A app/views/custom_flags/index.js.erb
A app/views/custom_flags/new.js.erb
A app/views/ignore_flags/create.js.erb
A app/views/ignore_flags/destroy.js.erb
A app/views/ignore_flags/new.js.erb
A app/views/interventions/quicklists/index.js.erb
A app/views/layouts/application.js.erb
A app/views/principal_overrides/create.js.erb
A app/views/principal_overrides/new.js.erb
A app/views/student_comments/_student_comment.html.erb
A app/views/student_comments/create.js.erb
A app/views/student_comments/new.js.erb
A app/views/student_searches/grade.js.erb
A app/views/student_searches/member.js.erb
A public/javascripts/application-jquery.js
A public/javascripts/jquery-ui.js
A public/javascripts/jquery-ui.min.js
A public/javascripts/jquery.js
A public/javascripts/jquery.min.js
A public/javascripts/jquery_ujs.js
R app/views/custom_flags/create.js.rjs
R app/views/custom_flags/destroy.js.rjs
R app/views/custom_flags/new.js.rjs
R app/views/ignore_flags/create.js.rjs
R app/views/ignore_flags/destroy.js.rjs
R app/views/ignore_flags/new.js.rjs
R app/views/interventions/quicklists/index.js.rjs
R app/views/principal_overrides/create.js.rjs
R app/views/principal_overrides/new.js.rjs
R app/views/student_comments/_comment.html.erb
R app/views/student_comments/create.js.rjs
R app/views/student_comments/new.js.rjs
R app/views/student_searches/grade.js.rjs
R app/views/student_searches/member.js.rjs
M Gemfile
M Gemfile.lock
M app/assets/javascripts/application.js
M app/assets/stylesheets/common.css.erb
M app/controllers/application_controller.rb
M app/controllers/custom_flags_controller.rb
M app/controllers/interventions/quicklists_controller.rb
M app/controllers/interventions_controller.rb
M app/controllers/recommendations_controller.rb
M app/controllers/schools_controller.rb
M app/controllers/spell_check_controller.rb
M app/controllers/student_comments_controller.rb
M app/controllers/student_searches_controller.rb
M app/controllers/students_controller.rb
M app/controllers/users/sessions_controller.rb
M app/helpers/application_helper.rb
M app/helpers/checklists_helper.rb
M app/helpers/flags_helper.rb
M app/helpers/links_and_attachments_helper.rb
M app/helpers/students_helper.rb
M app/views/assets/_asset.html.erb
M app/views/assets/_asset_form.html.erb
M app/views/custom_flags/_flag.html.erb
M app/views/custom_flags/_list.html.erb
M app/views/custom_flags/_new_custom_flag.html.erb
M app/views/ignore_flags/_new.html.erb
M app/views/layouts/application.html.erb
M app/views/login/_whats_new.html.erb
M app/views/principal_overrides/_new.html.erb
M app/views/spell_check/check_spelling.html.erb
M app/views/student_comments/_new.html.erb
M app/views/student_searches/show.html.erb
M app/views/students/_checklists.html.erb
M app/views/students/_extended_profile.html.erb
M app/views/students/_interventions.html.erb
M app/views/students/_recommendations.html.erb
M app/views/students/_review_and_summary.html.erb
M app/views/students/_student.html.erb
M app/views/students/_team_consultations.html.erb
M app/views/students/_team_notes.html.erb
M app/views/students/index.html.erb
M config/routes.rb
M doc/oneoffscripts.txt
M features/regular_user/group_search.feature
M features/regular_user/rjs_dropdown_group_search.feature
M features/step_definitions/sims_steps.rb
M spec/helpers/application_helper_spec.rb
M spec/helpers/students_helper_spec.rb