Changeset [df83611e5c4e48bd728fd6bb68a5138ce15945ea] by Shawn Balestracci
Revision df83611e5c4e48bd728fd6bb68a5138ce15945ea,
committed by Shawn Balestracci
· February 18th, 2013 @ 08:18 PM
Merge branch '620_cico' and '632_sld_enhancements' to make wip2
Conflicts:
lib/create_training_district.rb
https://github.com/vegantech/sims/commit/df83611e5c4e48bd728fd6bb68...
57 changed files
-
A
app/assets/javascripts/coffee/cico.js.coffee -
A
app/controllers/cico_controller.rb -
A
app/controllers/cico_school_days_controller.rb -
A
app/controllers/cico_settings_controller.rb -
A
app/helpers/cico_school_days_helper.rb -
A
app/helpers/cico_settings_helper.rb -
A
app/models/cico_expectation.rb -
A
app/models/cico_period.rb -
A
app/models/cico_period_expectation.rb -
A
app/models/cico_school_day.rb -
A
app/models/cico_setting.rb -
A
app/models/cico_student_day.rb -
A
app/views/cico/index.html.erb -
A
app/views/cico_school_days/edit.html.erb -
A
app/views/cico_school_days/index.html.erb -
A
app/views/cico_school_days/new.html.erb -
A
app/views/cico_school_days/show.html.erb -
A
app/views/cico_settings/_cico_expectation.html.erb -
A
app/views/cico_settings/_cico_period.html.erb -
A
app/views/cico_settings/edit.html.erb -
A
app/views/cico_settings/index.html.erb -
A
app/views/layouts/_cico_links.html.erb -
A
db/migrate/20110610143952_create_cico_settings.rb -
A
db/migrate/20110610163912_add_cico_to_probe_definition.rb -
A
db/migrate/20110612165003_create_cico_school_days.rb -
A
db/migrate/20110612170225_create_cico_periods.rb -
A
db/migrate/20110612170238_create_cico_expectations.rb -
A
db/migrate/20110612170657_create_cico_student_days.rb -
A
db/migrate/20110612171205_create_cico_period_expectations.rb -
A
lib/cico_test.rb -
A
spec/controllers/cico_school_days_controller_spec.rb -
A
spec/controllers/cico_settings_controller_spec.rb -
A
spec/fixtures/cico_expectations.yml -
A
spec/fixtures/cico_period_expectations.yml -
A
spec/fixtures/cico_periods.yml -
A
spec/fixtures/cico_school_days.yml -
A
spec/fixtures/cico_settings.yml -
A
spec/fixtures/cico_student_days.yml -
A
spec/helpers/cico_school_days_helper_spec.rb -
A
spec/helpers/cico_settings_helper_spec.rb -
A
spec/models/cico_expectation_spec.rb -
A
spec/models/cico_period_expectation_spec.rb -
A
spec/models/cico_period_spec.rb -
A
spec/models/cico_school_day_spec.rb -
A
spec/models/cico_setting_spec.rb -
A
spec/models/cico_student_day_spec.rb -
A
spec/routing/cico_school_days_routing_spec.rb -
A
spec/routing/cico_settings_routing_spec.rb -
M
app/cells/administration/school.html.erb -
M
app/models/probe_definition.rb -
M
app/models/right.rb -
M
app/models/school.rb -
M
app/views/intervention_builder/probes/_form.html.erb -
M
app/views/layouts/_menu.html.erb -
M
config/routes.rb -
M
db/schema.rb -
M
lib/create_training_district.rb