Changeset [fef878cef5dc2f165717bcafedc38c8d154cba46] by Shawn Balestracci
September 9th, 2012 @ 07:20 PM
Merge branch 'master' into jquery
Conflicts:
Gemfile.lock
app/views/spell_check/check_spelling.html.erb
config/application.rb
https://github.com/vegantech/sims/commit/fef878cef5dc2f165717bcafed...
Committed by Shawn Balestracci
- A app/controllers/chart_proxy_app.rb
- A app/controllers/session_check_app.rb
- A db/migrate/20120909153928_add_default_value_to_encrypted_password.rb
- A public/images/200px-Windows_Live_logo.svg.png
- A public/images/Gmail-128.png
- A public/images/WindowsLive-128.png
- A spec/controllers/chart_proxy_app_spec.rb
- A spec/controllers/session_check_app_spec.rb
- R app/metal/chart_proxy.rb
- R lib/all_controllers.rb
- R spec/lib/all_controllers_spec.rb
- M .travis.yml
- M Gemfile
- M Gemfile.lock
- M app/helpers/links_and_attachments_helper.rb
- M app/models/district.rb
- M app/models/grouped_progress_entry.rb
- M app/models/intervention_definition.rb
- M app/views/districts/edit.html.erb
- M app/views/intervention_builder/recommended_monitors/assign_interventions_to_probe.html.erb
- M app/views/intervention_builder/recommended_monitors/assign_probes_to_intervention.html.erb
- M app/views/interventions/comments/_edit_js.html.erb
- M app/views/spell_check/check_spelling.html.erb
- M app/views/users/sessions/new.html.erb
- M config/application.rb
- M config/database.yml.mysql
- M config/deploy.rb
- M config/deploy/prohibition.rb
- M config/deploy/staging.rb
- M config/deploy/veg_open.rb
- M config/deploy/wip.rb
- M config/initializers/host_info.rb
- M config/moonshine.yml
- M config/moonshine/production.yml
- M config/moonshine/staging.yml
- M config/routes.rb
- M db/schema.rb
- M features/regular_user/doc.feature
- M features/step_definitions/file_import.rb
- M lib/csv_importer/all_students_in_schools.rb
- M lib/csv_importer/school_admins.rb
- M lib/tasks/rspec.rake
- M lib/tasks/verify_rcov.rake
- M public/favicon.ico
- M public/javascripts/prototype.js
- M spec/helpers/links_and_attachments_spec.rb
- M spec/lib/csv_importer/enrollments_spec.rb
- M spec/models/user_spec.rb
- M vendor/plugins/moonshine/lib/moonshine/capistrano_integration.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