Changeset [b3d39cc7122912e558605cd6cdb6118b127406b8] by Shawn Balestracci
August 11th, 2012 @ 08:38 AM
Merge branch 'master' into ruby_1.9.3
Conflicts:
Gemfile
Gemfile.lock
app/controllers/application_controller.rb
lib/create_training_district.rb
spec/controllers/application_controller_spec.rb
spec/spec_helper.rb
https://github.com/vegantech/sims/commit/b3d39cc7122912e558605cd6cd...
Committed by Shawn Balestracci
- A Guardfile
- A app/controllers/users/omniauth_callbacks_controller.rb
- A app/controllers/users/passwords_controller.rb
- A app/controllers/users/sessions_controller.rb
- A app/models/devise/legacy_password.rb
- A app/views/devise/confirmations/new.html.erb
- A app/views/devise/mailer/confirmation_instructions.html.erb
- A app/views/devise/mailer/reset_password_instructions.html.erb
- A app/views/devise/mailer/unlock_instructions.html.erb
- A app/views/devise/registrations/edit.html.erb
- A app/views/devise/registrations/new.html.erb
- A app/views/devise/shared/_links.erb
- A app/views/devise/unlocks/new.html.erb
- A app/views/main/change_password.html.erb
- A app/views/users/passwords/edit.html.erb
- A app/views/users/passwords/new.html.erb
- A app/views/users/sessions/new.html.erb
- A config/initializers/devise.rb
- A config/locales/devise.en.yml
- A db/migrate/20120529145327_add_devise_to_users.rb
- A db/migrate/20120626014700_add_settings_to_districts.rb
- A db/migrate/20120626021737_switch_district_fields_to_settings.rb
- A features/step_definitions/login_steps.rb
- A spec/controllers/login_controller_spec.rb.old
- A spec/csv/students/invalid_birthdate/students.csv
- A spec/models/devise/legacy_password_spec.rb
- R app/controllers/login_controller.rb
- R app/views/login/_login.html.erb
- R app/views/login/_logout.html.erb
- R app/views/login/change_password.html.erb
- R app/views/login/login.html.erb
- R spec/controllers/login_controller_spec.rb
- M .gitignore
- M Gemfile
- M Gemfile.lock
- M app/cells/news_cell.rb
- M app/controllers/application_controller.rb
- M app/controllers/custom_flags_controller.rb
- M app/controllers/district/users_controller.rb
- M app/controllers/doc_controller.rb
- M app/controllers/help_controller.rb
- M app/controllers/intervention_builder/categories_controller.rb
- M app/controllers/intervention_builder/interventions_controller.rb
- M app/controllers/intervention_builder/objectives_controller.rb
- M app/controllers/main_controller.rb
- M app/controllers/principal_overrides_controller.rb
- M app/controllers/reports_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/scripted_controller.rb
- M app/controllers/spell_check_controller.rb
- M app/controllers/stats_controller.rb
- M app/controllers/student_searches_controller.rb
- M app/controllers/team_consultations_controller.rb
- M app/helpers/application_helper.rb
- M app/helpers/interventions_helper.rb
- M app/helpers/probes_helper.rb
- M app/metal/session_check.rb
- M app/models/district.rb
- M app/models/district_log.rb
- M app/models/intervention_definition.rb
- M app/models/system.rb
- M app/models/user.rb
- M app/views/districts/edit.html.erb
- M app/views/interventions/_custom.html.erb
- M app/views/interventions/probe_assignments/_custom_probe_definition.html.erb
- M app/views/interventions/probe_assignments/_intervention_probe_assignment_detail.html.erb
- M app/views/interventions/probe_assignments/_probe_assignment.html.erb
- M app/views/layouts/_administration.html.erb
- M app/views/layouts/_menu.html.erb
- M app/views/layouts/application.html.erb
- M app/views/layouts/email.erb
- M app/views/layouts/main.html.erb
- M app/views/login/_whats_new.html.erb
- M app/views/main/_news.html.erb
- M app/views/main/index.html.erb
- M app/views/students/_interventions.html.erb
- M config/application.rb
- M config/deploy.rb
- M config/routes.rb
- M db/schema.rb
- M features/district_admin/district_admin.feature
- M features/district_admin/district_users_admin.feature
- M features/regular_user/doc.feature
- M features/regular_user/forgot_password.feature
- M features/regular_user/login.feature
- M features/regular_user/sims_demo_walkthrough.feature
- M features/regular_user/stats.feature
- M features/step_definitions/custom_email_steps.rb
- M features/step_definitions/file_import.rb
- M features/step_definitions/sims_steps.rb
- M lib/create_training_district.rb
- M lib/csv_importer/students.rb
- M lib/populate_intervention_dropdowns.rb
- M public/stylesheets/common.css
- M spec/controllers/application_controller_spec.rb
- M spec/controllers/checklist_builder/checklists_controller_spec.rb
- M spec/controllers/district/users_controller_spec.rb
- M spec/controllers/interventions/comments_controller_spec.rb
- M spec/controllers/interventions/participants_controller_spec.rb
- M spec/controllers/interventions/probes_controller_spec.rb
- M spec/controllers/main_controller_spec.rb
- M spec/controllers/reports_controller_spec.rb
- M spec/controllers/schools_controller_spec.rb
- M spec/controllers/stats_controller_spec.rb
- M spec/controllers/student_comments_controller_spec.rb
- M spec/controllers/student_searches_controller_spec.rb
- M spec/controllers/team_consultations_controller_spec.rb
- M spec/fixtures/users.yml
- M spec/helpers/interventions_helper_spec.rb
- M spec/helpers/probes_helper_spec.rb
- M spec/helpers/r_j_s_builder_helper_spec.rb
- M spec/lib/all_controllers_spec.rb
- M spec/lib/csv_importer/students_spec.rb
- M spec/lib/populate_intervention_dropdowns_spec.rb
- M spec/mailers/team_referrals_spec.rb
- M spec/models/district_spec.rb
- M spec/models/intervention_definition_spec.rb
- M spec/models/student_spec.rb
- M spec/models/user_spec.rb
- M spec/spec_helper.rb
- M spec/support/shared_contexts.rb
- 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